rtl8xxxu: Another 8723bu patch for rtl8xxxu_init_phy_bb()
authorJes Sorensen <Jes.Sorensen@redhat.com>
Mon, 29 Feb 2016 22:04:56 +0000 (17:04 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 10 Mar 2016 13:29:07 +0000 (15:29 +0200)
This function is going to need to be split up into chip specific
variants.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c

index 7f69a1b6980de1b51abcc061804b826fd1426cf5..3f742b74f29315fe85bafd9fc369540bacda09a3 100644 (file)
@@ -3142,13 +3142,16 @@ static int rtl8xxxu_init_phy_bb(struct rtl8xxxu_priv *priv)
                rtl8xxxu_write32(priv, REG_MAC_PHY_CTRL, val32);
        }
 
-       ldoa15 = LDOA15_ENABLE | LDOA15_OBUF;
-       ldov12d = LDOV12D_ENABLE | BIT(2) | (2 << LDOV12D_VADJ_SHIFT);
-       ldohci12 = 0x57;
-       lpldo = 1;
-       val32 = (lpldo << 24) | (ldohci12 << 16) | (ldov12d << 8) | ldoa15;
+       if (priv->rtlchip != 0x8723bu) {
+               ldoa15 = LDOA15_ENABLE | LDOA15_OBUF;
+               ldov12d = LDOV12D_ENABLE | BIT(2) | (2 << LDOV12D_VADJ_SHIFT);
+               ldohci12 = 0x57;
+               lpldo = 1;
+               val32 = (lpldo << 24) | (ldohci12 << 16) |
+                       (ldov12d << 8) | ldoa15;
 
-       rtl8xxxu_write32(priv, REG_LDOA15_CTRL, val32);
+               rtl8xxxu_write32(priv, REG_LDOA15_CTRL, val32);
+       }
 
        return 0;
 }