OSDN Git Service

rtl8xxxu: Remove unneeded 8192eu hack
authorJes Sorensen <Jes.Sorensen@redhat.com>
Thu, 14 Apr 2016 18:59:05 +0000 (14:59 -0400)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 15 Apr 2016 18:36:46 +0000 (21:36 +0300)
This removes an unneeded hack for 8192eu, and allows for initializing
REG_FPGA0_XAB_RF_SW_CTRL at the same point as it is done for all other
parts.

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 821be87..5c56a4f 100644 (file)
@@ -7680,15 +7680,12 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
        /* RFSW Control - clear bit 14 ?? */
        if (priv->rtl_chip != RTL8723B && priv->rtl_chip != RTL8192E)
                rtl8xxxu_write32(priv, REG_FPGA0_TX_INFO, 0x00000003);
-       /* 0x07000760 */
-       if (priv->rtl_chip == RTL8192E) {
-               val32 = 0;
-       } else {
-               val32 = FPGA0_RF_TRSW | FPGA0_RF_TRSWB | FPGA0_RF_ANTSW |
-                       FPGA0_RF_ANTSWB | FPGA0_RF_PAPE |
-                       ((FPGA0_RF_ANTSW | FPGA0_RF_ANTSWB | FPGA0_RF_PAPE) <<
-                        FPGA0_RF_BD_CTRL_SHIFT);
-       }
+
+       val32 = FPGA0_RF_TRSW | FPGA0_RF_TRSWB | FPGA0_RF_ANTSW |
+               FPGA0_RF_ANTSWB | FPGA0_RF_PAPE |
+               ((FPGA0_RF_ANTSW | FPGA0_RF_ANTSWB | FPGA0_RF_PAPE) <<
+                FPGA0_RF_BD_CTRL_SHIFT);
+
        rtl8xxxu_write32(priv, REG_FPGA0_XAB_RF_SW_CTRL, val32);
        /* 0x860[6:5]= 00 - why? - this sets antenna B */
        if (priv->rtl_chip != RTL8192E)