diff options
| author | hayeswang <hayeswang@realtek.com> | 2014-02-18 17:49:03 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-19 01:40:01 +0400 |
| commit | f0cbe0ac87c123a80dac3b2df72ecb947ef63ad8 (patch) | |
| tree | c4887d0bb3dbc88891d6cfaaeb6c9dc19aeb13a7 /drivers/net/usb | |
| parent | d84130a10820d074fe52b066f459838324d3774c (diff) | |
| download | linux-f0cbe0ac87c123a80dac3b2df72ecb947ef63ad8.tar.xz | |
r8152: clear BMCR_PDOWN
Modify the method of enabling the PHY to clear BMCR_PDOWN only.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 2a778faa9630..c7bae3920038 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -1845,7 +1845,14 @@ static inline void r8152b_enable_aldps(struct r8152 *tp) static void r8152b_hw_phy_cfg(struct r8152 *tp) { - r8152_mdio_write(tp, MII_BMCR, BMCR_ANENABLE); + u16 data; + + data = r8152_mdio_read(tp, MII_BMCR); + if (data & BMCR_PDOWN) { + data &= ~BMCR_PDOWN; + r8152_mdio_write(tp, MII_BMCR, data); + } + r8152b_disable_aldps(tp); } @@ -1995,7 +2002,11 @@ static void r8153_hw_phy_cfg(struct r8152 *tp) u16 data; ocp_reg_write(tp, OCP_ADC_CFG, CKADSEL_L | ADC_EN | EN_EMI_L); - r8152_mdio_write(tp, MII_BMCR, BMCR_ANENABLE); + data = r8152_mdio_read(tp, MII_BMCR); + if (data & BMCR_PDOWN) { + data &= ~BMCR_PDOWN; + r8152_mdio_write(tp, MII_BMCR, data); + } if (tp->version == RTL_VER_03) { data = ocp_reg_read(tp, OCP_EEE_CFG); |