diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-14 22:04:30 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-14 22:04:30 +0200 |
| commit | 50298d37e698a6c730eacf1811da5e7011e20113 (patch) | |
| tree | a51aafa009344af9da761e9477264d53bc60117d /drivers/net/4xx_enet.c | |
| parent | cb8f0317295482b1a48802778a6927510cb145ba (diff) | |
| parent | ab9164d0defe766fbbf0bc75c7e1645de63b7923 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/4xx_enet.c')
| -rw-r--r-- | drivers/net/4xx_enet.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index 2fac64167b..144b851357 100644 --- a/drivers/net/4xx_enet.c +++ b/drivers/net/4xx_enet.c @@ -1095,6 +1095,11 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis) miiphy_write (dev->name, reg, 0x18, 0x4101); miiphy_write (dev->name, reg, 0x09, 0x0e00); miiphy_write (dev->name, reg, 0x04, 0x01e1); +#if defined(CONFIG_M88E1111_DISABLE_FIBER) + miiphy_read(dev->name, reg, 0x1b, ®_short); + reg_short |= 0x8000; + miiphy_write(dev->name, reg, 0x1b, reg_short); +#endif #endif #if defined(CONFIG_M88E1112_PHY) if (bis->bi_phymode[devnum] == BI_PHYMODE_SGMII) { |