diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /drivers/qe/uec_phy.c | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'drivers/qe/uec_phy.c')
| -rw-r--r-- | drivers/qe/uec_phy.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c index 94253797946..69c22dd5e26 100644 --- a/drivers/qe/uec_phy.c +++ b/drivers/qe/uec_phy.c @@ -12,6 +12,7 @@ #include <common.h> #include <net.h> #include <malloc.h> +#include <linux/delay.h> #include <linux/errno.h> #include <linux/immap_qe.h> #include <asm/io.h> @@ -875,7 +876,7 @@ void marvell_phy_interface_mode(struct eth_device *dev, phy_interface_t type, uec_phy_write(mii_info, 0x04, 0x01e1); uec_phy_write(mii_info, 0x00, 0x9140); uec_phy_write(mii_info, 0x00, 0x1000); - udelay (100000); + mdelay(100); uec_phy_write(mii_info, 0x00, 0x2900); uec_phy_write(mii_info, 0x14, 0x0cd2); uec_phy_write(mii_info, 0x00, 0xa100); @@ -884,13 +885,13 @@ void marvell_phy_interface_mode(struct eth_device *dev, phy_interface_t type, uec_phy_write(mii_info, 0x04, 0x05e1); uec_phy_write(mii_info, 0x00, 0xa100); uec_phy_write(mii_info, 0x00, 0x2100); - udelay (1000000); + mdelay(1000); } else if (speed == SPEED_10) { uec_phy_write(mii_info, 0x14, 0x8e40); uec_phy_write(mii_info, 0x1b, 0x800b); uec_phy_write(mii_info, 0x14, 0x0c82); uec_phy_write(mii_info, 0x00, 0x8100); - udelay (1000000); + mdelay(1000); } } |