diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 13:33:23 (GMT) |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-05-18 13:33:23 (GMT) |
| commit | fdda367561f0f6fb21d5b575402c0f9d2fd08e76 (patch) | |
| tree | afb703e6e43ff91e6f456f12fbb43fb598373fd5 /cpu/mpc5xxx/fec.c | |
| parent | 1443a31457d68f7e8f0b9403e9832ec1e79dc59d (diff) | |
| parent | 70124c2602ae2d4c5d3dba05b482d91548242de8 (diff) | |
| download | u-boot-fdda367561f0f6fb21d5b575402c0f9d2fd08e76.tar.xz | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu/mpc5xxx/fec.c')
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index e59bd85..00e8911 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -395,7 +395,9 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) { mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv; +#ifndef CONFIG_MOTIONPRO const uint8 phyAddr = CONFIG_PHY_ADDR; /* Only one PHY */ +#endif /* !CONFIG_MOTIONPRO */ #if (DEBUG & 0x1) printf ("mpc5xxx_fec_init_phy... Begin\n"); @@ -428,6 +430,14 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) */ fec->eth->imask = 0x00000000; +/* + * In original Promess-provided code PHY initialization is disabled with the + * following comment: "Phy initialization is DISABLED for now. There was a + * problem with running 100 Mbps on PRO board". Thus we temporarily disable + * PHY initialization for the Motion-PRO board, until a proper fix is found. + */ + +#ifndef CONFIG_MOTIONPRO if (fec->xcv_type != SEVENWIRE) { /* * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock @@ -554,6 +564,7 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) } } +#endif /* !CONFIG_MOTIONPRO */ #if (DEBUG & 0x2) if (fec->xcv_type != SEVENWIRE) |