diff options
Diffstat (limited to 'drivers/qe')
| -rw-r--r-- | drivers/qe/qe.c | 2 | ||||
| -rw-r--r-- | drivers/qe/uec.c | 2 | ||||
| -rw-r--r-- | drivers/qe/uec_phy.c | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index fbad124b51..61ca4760c8 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -781,7 +781,7 @@ struct qe_firmware_info *qe_get_firmware_info(void) return qe_firmware_uploaded ? &qe_firmware_info : NULL; } -static int qe_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int qe_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { ulong addr; diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c index 69cdf9444a..849f191d6d 100644 --- a/drivers/qe/uec.c +++ b/drivers/qe/uec.c @@ -6,8 +6,10 @@ */ #include <common.h> +#include <log.h> #include <net.h> #include <malloc.h> +#include <linux/delay.h> #include <linux/errno.h> #include <asm/io.h> #include <linux/immap_qe.h> diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c index 9425379794..69c22dd5e2 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); } } |