diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/mxc_i2c.c | 4 | ||||
| -rw-r--r-- | drivers/net/mxc_fec.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 6732b41..7479c60 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -38,6 +38,8 @@ #include <asm/arch/mx35.h> #elif defined(CONFIG_MX51_3DS) #include <asm/arch/mx51.h> +#elif defined(CONFIG_MX53) +#include <asm/arch/mx53.h> #else #error "Please include specific headfile " #endif @@ -233,7 +235,7 @@ static int i2c_addr(uchar chip, uint addr, int alen) int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len) { int timeout = I2C_MAX_TIMEOUT; - int ret; + uint ret; DPRINTF("%s chip: 0x%02x addr: 0x%04x alen: %d len: %d\n", __func__, chip, addr, alen, len); diff --git a/drivers/net/mxc_fec.c b/drivers/net/mxc_fec.c index 314496e..0e6c0b0 100644 --- a/drivers/net/mxc_fec.c +++ b/drivers/net/mxc_fec.c @@ -93,7 +93,7 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_MX25 +#if defined(CONFIG_MX25) || defined(CONFIG_MX53) /* * * i.MX25 allows RMII mode to be configured via a gasket * */ @@ -124,6 +124,9 @@ static inline void fec_localhw_setup(volatile fec_t *fecp) /* re-enable the gasket */ fecp->fec_miigsk_enr = FEC_MIIGSK_ENR_EN; + + while (!(fecp->fec_miigsk_enr & FEC_MIIGSK_ENR_READY)) + udelay(1); } #else static inline void fec_localhw_setup(fec_t *fecp) |