diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-12 00:22:49 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-12 00:22:49 +0200 |
| commit | dafba16e6fc1837381c8e74c4891ad6965cf54ab (patch) | |
| tree | aada3eb0493d66feda509795bf1e0e4264d78a7d /cpu | |
| parent | 8f79e4c2da54cea11bb576870059fc1ba8847ccb (diff) | |
| parent | 84286386a891633aae770bff24189c16a2546ed0 (diff) | |
| download | u-boot-imx-dafba16e6fc1837381c8e74c4891ad6965cf54ab.zip u-boot-imx-dafba16e6fc1837381c8e74c4891ad6965cf54ab.tar.gz u-boot-imx-dafba16e6fc1837381c8e74c4891ad6965cf54ab.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/ppc4xx/440gx_enet.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/ppc4xx/440gx_enet.c b/cpu/ppc4xx/440gx_enet.c index 63227fa..68cbf34 100644 --- a/cpu/ppc4xx/440gx_enet.c +++ b/cpu/ppc4xx/440gx_enet.c @@ -375,8 +375,8 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis) out32 (RGMII_FER, ((RGMII_FER_RGMII << RGMII_FER_V (2)) | (RGMII_FER_RGMII << RGMII_FER_V (3)))); } - #endif + out32 (ZMII_SSR, ZMII_SSR_SP << ZMII_SSR_V(devnum)); __asm__ volatile ("eieio"); @@ -521,13 +521,13 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis) } mtsdr(sdr_mfr, reg); #endif + /* Set ZMII/RGMII speed according to the phy link speed */ reg = in32 (ZMII_SSR); if ( (speed == 100) || (speed == 1000) ) out32 (ZMII_SSR, reg | (ZMII_SSR_SP << ZMII_SSR_V (devnum))); else - out32 (ZMII_SSR, - reg & (~(ZMII_SSR_SP << ZMII_SSR_V (devnum)))); + out32 (ZMII_SSR, reg & (~(ZMII_SSR_SP << ZMII_SSR_V (devnum)))); if ((devnum == 2) || (devnum == 3)) { if (speed == 1000) @@ -672,7 +672,7 @@ static int ppc_440x_eth_init (struct eth_device *dev, bd_t * bis) /* set RX buffer size */ mtdcr (malrcbs3, ENET_MAX_MTU_ALIGNED / 16); break; -#endif /*CONFIG_440GX */ +#endif /* CONFIG_440GX */ case 0: default: /* setup MAL tx & rx channel pointers */ |