These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / wireless / realtek / rtlwifi / rtl8192cu / phy.c

diff --git a/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c
similarity index 94%
rename from kernel/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
rename to kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c
index 12f6d47..c972fa5 100644 (file)
--- a/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/phy.c
+++ b/kernel/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/phy.c
@@ -108,13 +108,8 @@ void rtl92cu_phy_set_rf_reg(struct ieee80211_hw *hw,
 bool rtl92cu_phy_mac_config(struct ieee80211_hw *hw)
 {
        bool rtstatus;
-       struct rtl_priv *rtlpriv = rtl_priv(hw);
-       struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
-       bool is92c = IS_92C_SERIAL(rtlhal->version);
 
        rtstatus = _rtl92cu_phy_config_mac_with_headerfile(hw);
-       if (is92c && IS_HARDWARE_TYPE_8192CE(rtlhal))
-               rtl_write_byte(rtlpriv, 0x14, 0x71);
        return rtstatus;
 }
 
@@ -122,7 +117,6 @@ bool rtl92cu_phy_bb_config(struct ieee80211_hw *hw)
 {
        bool rtstatus = true;
        struct rtl_priv *rtlpriv = rtl_priv(hw);
-       struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
        u16 regval;
        u32 regval32;
        u8 b_reg_hwparafile = 1;
@@ -134,17 +128,11 @@ bool rtl92cu_phy_bb_config(struct ieee80211_hw *hw)
        rtl_write_byte(rtlpriv, REG_AFE_PLL_CTRL, 0x83);
        rtl_write_byte(rtlpriv, REG_AFE_PLL_CTRL + 1, 0xdb);
        rtl_write_byte(rtlpriv, REG_RF_CTRL, RF_EN | RF_RSTB | RF_SDMRSTB);
-       if (IS_HARDWARE_TYPE_8192CE(rtlhal)) {
-               rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_PPLL | FEN_PCIEA |
-                              FEN_DIO_PCIE |   FEN_BB_GLB_RSTn | FEN_BBRSTB);
-       } else if (IS_HARDWARE_TYPE_8192CU(rtlhal)) {
-               rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD |
-                              FEN_BB_GLB_RSTn | FEN_BBRSTB);
-       }
+       rtl_write_byte(rtlpriv, REG_SYS_FUNC_EN, FEN_USBA | FEN_USBD |
+                      FEN_BB_GLB_RSTn | FEN_BBRSTB);
        regval32 = rtl_read_dword(rtlpriv, 0x87c);
        rtl_write_dword(rtlpriv, 0x87c, regval32 & (~BIT(31)));
-       if (IS_HARDWARE_TYPE_8192CU(rtlhal))
-               rtl_write_byte(rtlpriv, REG_LDOHCI12_CTRL, 0x0f);
+       rtl_write_byte(rtlpriv, REG_LDOHCI12_CTRL, 0x0f);
        rtl_write_byte(rtlpriv, REG_AFE_XTAL_CTRL + 1, 0x80);
        if (b_reg_hwparafile == 1)
                rtstatus = _rtl92c_phy_bb8192c_config_parafile(hw);
@@ -162,7 +150,7 @@ bool _rtl92cu_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Read Rtl819XMACPHY_Array\n");
        arraylength =  rtlphy->hwparam_tables[MAC_REG].length ;
        ptrarray = rtlphy->hwparam_tables[MAC_REG].pdata;
-       RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CEMAC_2T_ARRAY\n");
+       RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Img:RTL8192CUMAC_2T_ARRAY\n");
        for (i = 0; i < arraylength; i = i + 2)
                rtl_write_byte(rtlpriv, ptrarray[i], (u8) ptrarray[i + 1]);
        return true;
@@ -259,18 +247,18 @@ bool rtl92cu_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
                radiob_arraylen = rtlphy->hwparam_tables[RADIOB_2T].length;
                radiob_array_table = rtlphy->hwparam_tables[RADIOB_2T].pdata;
                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "Radio_A:RTL8192CERADIOA_2TARRAY\n");
+                        "Radio_A:RTL8192CURADIOA_2TARRAY\n");
                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "Radio_B:RTL8192CE_RADIOB_2TARRAY\n");
+                        "Radio_B:RTL8192CU_RADIOB_2TARRAY\n");
        } else {
                radioa_arraylen = rtlphy->hwparam_tables[RADIOA_1T].length;
                radioa_array_table = rtlphy->hwparam_tables[RADIOA_1T].pdata;
                radiob_arraylen = rtlphy->hwparam_tables[RADIOB_1T].length;
                radiob_array_table = rtlphy->hwparam_tables[RADIOB_1T].pdata;
                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "Radio_A:RTL8192CE_RADIOA_1TARRAY\n");
+                        "Radio_A:RTL8192CU_RADIOA_1TARRAY\n");
                RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-                        "Radio_B:RTL8192CE_RADIOB_1TARRAY\n");
+                        "Radio_B:RTL8192CU_RADIOB_1TARRAY\n");
        }
        RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Radio No %x\n", rfpath);
        switch (rfpath) {