diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 16:00:55 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 16:00:55 (GMT) |
| commit | b37df85960a34dd96d0a4695c650f7972ef56c30 (patch) | |
| tree | 6b096e3c01bbfd4bac062f3e013e9a43de1a8f4e /drivers/net/ucc_geth_phy.c | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
| parent | 2cb4abd12bab7efd22a8b69d3b9a739500e8fee5 (diff) | |
| download | linux-fsl-qoriq-b37df85960a34dd96d0a4695c650f7972ef56c30.tar.xz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
MAINTAINERS: update DMFE and wireless drivers mailing list
ucc_geth: Add support to local-mac-address property
ucc_geth: Remove obsolete workaround of link speed change
cxgb3: sysfs attributes in -mm tree
Add Attansic L1 ethernet driver.
Diffstat (limited to 'drivers/net/ucc_geth_phy.c')
| -rw-r--r-- | drivers/net/ucc_geth_phy.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c index 3c86592..6fda6d8 100644 --- a/drivers/net/ucc_geth_phy.c +++ b/drivers/net/ucc_geth_phy.c @@ -376,6 +376,8 @@ static int marvell_init(struct ugeth_mii_info *mii_info) ugphy_vdbg("%s: IN", __FUNCTION__); ucc_geth_phy_write(mii_info, 0x14, 0x0cd2); + ucc_geth_phy_write(mii_info, 0x1b, + (ucc_geth_phy_read(mii_info, 0x1b) & ~0x000f) | 0x000b); ucc_geth_phy_write(mii_info, MII_BMCR, ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET); msleep(4000); |