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>
Signed-off-by: Preetham Chandru R <pchandru@nvidia.com>
(cherry picked from commit f0cbe0ac87c123a80dac3b2df72ecb947ef63ad8)
Change-Id: I4f722947af5e3254869ed6cb925515cbb0bf065b
Reviewed-on: http://git-master/r/370019
Tested-by: Aly Hirani <ahirani@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>

1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/net/usb/r8152_shield.c b/drivers/net/usb/r8152_shield.c
index d19c8c057..4c5c81ea3 100644
--- a/drivers/net/usb/r8152_shield.c
+++ b/drivers/net/usb/r8152_shield.c
@@ -1843,7 +1843,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);
 }
 
@@ -1993,7 +2000,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);