rtlwifi: Update 8812ae new phy parameters and its parser.

Update PHY tables for the RTL8812AE. A new parser is also needed.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
index 04c9c31..94a5e58 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
@@ -1841,7 +1841,7 @@ static bool _rtl8821ae_phy_config_mac_with_headerfile(struct ieee80211_hw *hw)
                arraylength = RTL8821AE_MAC_1T_ARRAYLEN;
                ptrarray = RTL8821AE_MAC_REG_ARRAY;
        } else {
-               arraylength = RTL8812AEMAC_1T_ARRAYLEN;
+               arraylength = RTL8812AE_MAC_1T_ARRAYLEN;
                ptrarray = RTL8812AE_MAC_REG_ARRAY;
        }
        RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
@@ -1861,7 +1861,7 @@ static bool _rtl8821ae_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
 
        if (configtype == BASEBAND_CONFIG_PHY_REG) {
                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
-                       arraylen = RTL8812AEPHY_REG_1TARRAYLEN;
+                       arraylen = RTL8812AE_PHY_REG_1TARRAYLEN;
                        array_table = RTL8812AE_PHY_REG_ARRAY;
                } else {
                        arraylen = RTL8821AE_PHY_REG_1TARRAYLEN;
@@ -1873,7 +1873,7 @@ static bool _rtl8821ae_phy_config_bb_with_headerfile(struct ieee80211_hw *hw,
                                _rtl8821ae_config_bb_reg);
        } else if (configtype == BASEBAND_CONFIG_AGC_TAB) {
                if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
-                       arraylen = RTL8812AEAGCTAB_1TARRAYLEN;
+                       arraylen = RTL8812AE_AGC_TAB_1TARRAYLEN;
                        array_table = RTL8812AE_AGC_TAB_ARRAY;
                } else {
                        arraylen = RTL8821AE_AGC_TAB_1TARRAYLEN;
@@ -1940,7 +1940,7 @@ static bool _rtl8821ae_phy_config_bb_with_pgheaderfile(struct ieee80211_hw *hw,
        u32 v1, v2, v3, v4, v5, v6;
 
        if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) {
-               arraylen = RTL8812AEPHY_REG_ARRAY_PGLEN;
+               arraylen = RTL8812AE_PHY_REG_ARRAY_PGLEN;
                array = RTL8812AE_PHY_REG_ARRAY_PG;
        } else {
                arraylen = RTL8821AE_PHY_REG_ARRAY_PGLEN;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
index 64e69e5..408c461 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
@@ -38,7 +38,7 @@ u32 RTL8812AE_PHY_REG_ARRAY[] = {
                0x824, 0x00030FE0,
                0x828, 0x00000000,
                0x82C, 0x002083DD,
-               0x830, 0x2AAA6C86,
+               0x830, 0x2EAAEEB8,
                0x834, 0x0037A706,
                0x838, 0x06C89B44,
                0x83C, 0x0000095B,
@@ -68,7 +68,7 @@ u32 RTL8812AE_PHY_REG_ARRAY[] = {
                0x8BC, 0x4CA520A3,
                0x8C0, 0x27F00020,
                0x8C4, 0x00000000,
-               0x8C8, 0x00013169,
+               0x8C8, 0x00012D69,
                0x8CC, 0x08248492,
                0x8D0, 0x0000B800,
                0x8DC, 0x00000000,
@@ -76,13 +76,7 @@ u32 RTL8812AE_PHY_REG_ARRAY[] = {
                0x8D8, 0x290B5612,
                0x8F8, 0x400002C0,
                0x8FC, 0x00000000,
-       0xFF0F07D8, 0xABCD,
                0x900, 0x00000701,
-       0xFF0F07D0, 0xCDEF,
-               0x900, 0x00000701,
-       0xCDCDCDCD, 0xCDCD,
-               0x900, 0x00000700,
-       0xFF0F07D8, 0xDEAD,
                0x90C, 0x00000000,
                0x910, 0x0000FC00,
                0x914, 0x00000404,
@@ -120,7 +114,7 @@ u32 RTL8812AE_PHY_REG_ARRAY[] = {
                0x9D4, 0x00000000,
                0x9D8, 0x00000000,
                0x9DC, 0x00000000,
-               0x9E4, 0x00000002,
+               0x9E4, 0x00000003,
                0x9E8, 0x000002D5,
                0xA00, 0x00D047C8,
                0xA04, 0x01FF000C,
@@ -189,7 +183,21 @@ u32 RTL8812AE_PHY_REG_ARRAY[] = {
                0xC5C, 0x00000058,
                0xC60, 0x34344443,
                0xC64, 0x07003333,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
+               0xC68, 0x59791979,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
+               0xC68, 0x59791979,
+       0x90000002, 0x00000000, 0x40000000, 0x00000000,
                0xC68, 0x59791979,
+       0x90000004, 0x00000000, 0x40000000, 0x00000000,
+               0xC68, 0x59791979,
+       0x90000001, 0x00000000, 0x40000000, 0x00000000,
+               0xC68, 0x59791979,
+       0x90000001, 0x00000005, 0x40000000, 0x00000000,
+               0xC68, 0x59791979,
+       0xA0000000, 0x00000000,
+               0xC68, 0x59799979,
+       0xB0000000, 0x00000000,
                0xC6C, 0x59795979,
                0xC70, 0x19795979,
                0xC74, 0x19795979,
@@ -203,19 +211,7 @@ u32 RTL8812AE_PHY_REG_ARRAY[] = {
                0xCA0, 0x00000029,
                0xCA4, 0x08040201,
                0xCA8, 0x80402010,
-       0xFF0F0740, 0xABCD,
-               0xCB0, 0x77547717,
-       0xFF0F01C0, 0xCDEF,
-               0xCB0, 0x77547717,
-       0xFF0F02C0, 0xCDEF,
-               0xCB0, 0x77547717,
-       0xFF0F07D8, 0xCDEF,
-               0xCB0, 0x54547710,
-       0xFF0F07D0, 0xCDEF,
-               0xCB0, 0x54547710,
-       0xCDCDCDCD, 0xCDCD,
                0xCB0, 0x77547777,
-       0xFF0F0740, 0xDEAD,
                0xCB4, 0x00000077,
                0xCB8, 0x00508242,
                0xE00, 0x00000007,
@@ -257,23 +253,14 @@ u32 RTL8812AE_PHY_REG_ARRAY[] = {
                0xEA0, 0x00000029,
                0xEA4, 0x08040201,
                0xEA8, 0x80402010,
-       0xFF0F0740, 0xABCD,
-               0xEB0, 0x77547717,
-       0xFF0F01C0, 0xCDEF,
-               0xEB0, 0x77547717,
-       0xFF0F02C0, 0xCDEF,
-               0xEB0, 0x77547717,
-       0xFF0F07D8, 0xCDEF,
-               0xEB0, 0x54547710,
-       0xFF0F07D0, 0xCDEF,
-               0xEB0, 0x54547710,
-       0xCDCDCDCD, 0xCDCD,
                0xEB0, 0x77547777,
-       0xFF0F0740, 0xDEAD,
                0xEB4, 0x00000077,
                0xEB8, 0x00508242,
 };
 
+u32 RTL8812AE_PHY_REG_1TARRAYLEN =
+       sizeof(RTL8812AE_PHY_REG_ARRAY) / sizeof(u32);
+
 u32 RTL8821AE_PHY_REG_ARRAY[] = {
        0x800, 0x0020D090,
        0x804, 0x080112E0,
@@ -501,6 +488,9 @@ u32 RTL8812AE_PHY_REG_ARRAY_PG[] = {
        1, 1, 1, 0x00000e4c, 0xffffffff, 0x22242628
 };
 
+u32 RTL8812AE_PHY_REG_ARRAY_PGLEN =
+               sizeof(RTL8812AE_PHY_REG_ARRAY_PG) / sizeof(u32);
+
 u32 RTL8821AE_PHY_REG_ARRAY_PG[] = {
        0, 0, 0, 0x00000c20, 0xffffffff, 0x32343638,
        0, 0, 0, 0x00000c24, 0xffffffff, 0x36363838,
@@ -529,26 +519,25 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x066, 0x00040000,
                0x01E, 0x00080000,
                0x089, 0x00000080,
-       0xFF0F0740, 0xABCD,
-               0x086, 0x00014B38,
-       0xFF0F02C0, 0xCDEF,
-               0x086, 0x00014B38,
-       0xFF0F01C0, 0xCDEF,
-               0x086, 0x00014B38,
-       0xFF0F07D8, 0xCDEF,
+       0x80000001, 0x00000000, 0x40000000, 0x00000000,
                0x086, 0x00014B3A,
-       0xFF0F07D0, 0xCDEF,
+       0x90000001, 0x00000005, 0x40000000, 0x00000000,
                0x086, 0x00014B3A,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x086, 0x00014B38,
-       0xFF0F0740, 0xDEAD,
+       0xB0000000, 0x00000000,
+       0x80000004, 0x00000000, 0x40000000, 0x00000000,
+               0x08B, 0x00080180,
+       0xA0000000, 0x00000000,
+               0x08B, 0x00087180,
+       0xB0000000, 0x00000000,
                0x0B1, 0x0001FC1A,
                0x0B3, 0x000F0810,
                0x0B4, 0x0001A78D,
                0x0BA, 0x00086180,
                0x018, 0x00000006,
                0x0EF, 0x00002000,
-       0xFF0F07D8, 0xABCD,
+       0x80000001, 0x00000000, 0x40000000, 0x00000000,
                0x03B, 0x0003F218,
                0x03B, 0x00030A58,
                0x03B, 0x0002FA58,
@@ -556,7 +545,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x03B, 0x0001FA50,
                0x03B, 0x00010248,
                0x03B, 0x00008240,
-       0xFF0F07D0, 0xCDEF,
+       0x90000001, 0x00000005, 0x40000000, 0x00000000,
                0x03B, 0x0003F218,
                0x03B, 0x00030A58,
                0x03B, 0x0002FA58,
@@ -564,7 +553,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x03B, 0x0001FA50,
                0x03B, 0x00010248,
                0x03B, 0x00008240,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x03B, 0x00038A58,
                0x03B, 0x00037A58,
                0x03B, 0x0002A590,
@@ -572,9 +561,9 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x03B, 0x00018248,
                0x03B, 0x00010240,
                0x03B, 0x00008240,
-       0xFF0F07D8, 0xDEAD,
+       0xB0000000, 0x00000000,
                0x0EF, 0x00000100,
-       0xFF0F07D8, 0xABCD,
+       0x80000002, 0x00000000, 0x40000000, 0x00000000,
                0x034, 0x0000A4EE,
                0x034, 0x00009076,
                0x034, 0x00008073,
@@ -586,7 +575,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x034, 0x00002028,
                0x034, 0x00001025,
                0x034, 0x00000022,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x034, 0x0000ADF4,
                0x034, 0x00009DF1,
                0x034, 0x00008DEE,
@@ -598,7 +587,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x034, 0x000024E7,
                0x034, 0x0000146B,
                0x034, 0x0000006D,
-       0xFF0F07D8, 0xDEAD,
+       0xB0000000, 0x00000000,
                0x0EF, 0x00000000,
                0x0EF, 0x000020A2,
                0x0DF, 0x00000080,
@@ -652,7 +641,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x03B, 0x0006B064,
                0x03C, 0x00004000,
                0x03A, 0x000000D8,
-               0x03B, 0x00023070,
+               0x03B, 0x00063070,
                0x03C, 0x00004000,
                0x03A, 0x00000468,
                0x03B, 0x0005B870,
@@ -691,43 +680,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x03B, 0x00082080,
                0x03C, 0x00010000,
                0x0EF, 0x00001100,
-       0xFF0F0740, 0xABCD,
-               0x034, 0x0004A0B2,
-               0x034, 0x000490AF,
-               0x034, 0x00048070,
-               0x034, 0x0004706D,
-               0x034, 0x00046050,
-               0x034, 0x0004504D,
-               0x034, 0x0004404A,
-               0x034, 0x00043047,
-               0x034, 0x0004200A,
-               0x034, 0x00041007,
-               0x034, 0x00040004,
-       0xFF0F02C0, 0xCDEF,
-               0x034, 0x0004A0B2,
-               0x034, 0x000490AF,
-               0x034, 0x00048070,
-               0x034, 0x0004706D,
-               0x034, 0x00046050,
-               0x034, 0x0004504D,
-               0x034, 0x0004404A,
-               0x034, 0x00043047,
-               0x034, 0x0004200A,
-               0x034, 0x00041007,
-               0x034, 0x00040004,
-       0xFF0F01C0, 0xCDEF,
-               0x034, 0x0004A0B2,
-               0x034, 0x000490AF,
-               0x034, 0x00048070,
-               0x034, 0x0004706D,
-               0x034, 0x00046050,
-               0x034, 0x0004504D,
-               0x034, 0x0004404A,
-               0x034, 0x00043047,
-               0x034, 0x0004200A,
-               0x034, 0x00041007,
-               0x034, 0x00040004,
-       0xFF0F07D8, 0xCDEF,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x034, 0x0004A0B2,
                0x034, 0x000490AF,
                0x034, 0x00048070,
@@ -739,80 +692,32 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x034, 0x0004200A,
                0x034, 0x00041007,
                0x034, 0x00040004,
-       0xFF0F07D0, 0xCDEF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
                0x034, 0x0004A0B2,
                0x034, 0x000490AF,
                0x034, 0x00048070,
                0x034, 0x0004706D,
-               0x034, 0x00046050,
-               0x034, 0x0004504D,
-               0x034, 0x0004404A,
-               0x034, 0x00043047,
-               0x034, 0x0004200A,
-               0x034, 0x00041007,
-               0x034, 0x00040004,
-       0xCDCDCDCD, 0xCDCD,
+               0x034, 0x0004604D,
+               0x034, 0x0004504A,
+               0x034, 0x00044047,
+               0x034, 0x00043044,
+               0x034, 0x00042007,
+               0x034, 0x00041004,
+               0x034, 0x00040001,
+       0xA0000000, 0x00000000,
                0x034, 0x0004ADF5,
                0x034, 0x00049DF2,
                0x034, 0x00048DEF,
                0x034, 0x00047DEC,
                0x034, 0x00046DE9,
-               0x034, 0x00045DC9,
-               0x034, 0x00044CE8,
-               0x034, 0x000438CA,
-               0x034, 0x00042889,
-               0x034, 0x0004184A,
-               0x034, 0x0004044A,
-       0xFF0F0740, 0xDEAD,
-       0xFF0F0740, 0xABCD,
-               0x034, 0x0002A0B2,
-               0x034, 0x000290AF,
-               0x034, 0x00028070,
-               0x034, 0x0002706D,
-               0x034, 0x00026050,
-               0x034, 0x0002504D,
-               0x034, 0x0002404A,
-               0x034, 0x00023047,
-               0x034, 0x0002200A,
-               0x034, 0x00021007,
-               0x034, 0x00020004,
-       0xFF0F02C0, 0xCDEF,
-               0x034, 0x0002A0B2,
-               0x034, 0x000290AF,
-               0x034, 0x00028070,
-               0x034, 0x0002706D,
-               0x034, 0x00026050,
-               0x034, 0x0002504D,
-               0x034, 0x0002404A,
-               0x034, 0x00023047,
-               0x034, 0x0002200A,
-               0x034, 0x00021007,
-               0x034, 0x00020004,
-       0xFF0F01C0, 0xCDEF,
-               0x034, 0x0002A0B2,
-               0x034, 0x000290AF,
-               0x034, 0x00028070,
-               0x034, 0x0002706D,
-               0x034, 0x00026050,
-               0x034, 0x0002504D,
-               0x034, 0x0002404A,
-               0x034, 0x00023047,
-               0x034, 0x0002200A,
-               0x034, 0x00021007,
-               0x034, 0x00020004,
-       0xFF0F07D8, 0xCDEF,
-               0x034, 0x0002A0B2,
-               0x034, 0x000290AF,
-               0x034, 0x00028070,
-               0x034, 0x0002706D,
-               0x034, 0x00026050,
-               0x034, 0x0002504D,
-               0x034, 0x0002404A,
-               0x034, 0x00023047,
-               0x034, 0x0002200A,
-               0x034, 0x00021007,
-               0x034, 0x00020004,
-       0xFF0F07D0, 0xCDEF,
+               0x034, 0x00045DE6,
+               0x034, 0x00044DE3,
+               0x034, 0x000438C8,
+               0x034, 0x000428C5,
+               0x034, 0x000418C2,
+               0x034, 0x000408C0,
+       0xB0000000, 0x00000000,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x034, 0x0002A0B2,
                0x034, 0x000290AF,
                0x034, 0x00028070,
@@ -824,56 +729,32 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x034, 0x0002200A,
                0x034, 0x00021007,
                0x034, 0x00020004,
-       0xCDCDCDCD, 0xCDCD,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
+               0x034, 0x0002A0B4,
+               0x034, 0x000290B1,
+               0x034, 0x00028072,
+               0x034, 0x0002706F,
+               0x034, 0x0002604F,
+               0x034, 0x0002504C,
+               0x034, 0x00024049,
+               0x034, 0x00023046,
+               0x034, 0x00022009,
+               0x034, 0x00021006,
+               0x034, 0x00020003,
+       0xA0000000, 0x00000000,
                0x034, 0x0002ADF5,
                0x034, 0x00029DF2,
                0x034, 0x00028DEF,
                0x034, 0x00027DEC,
                0x034, 0x00026DE9,
-               0x034, 0x00025DC9,
-               0x034, 0x00024CE8,
-               0x034, 0x000238CA,
-               0x034, 0x00022889,
-               0x034, 0x0002184A,
-               0x034, 0x0002044A,
-       0xFF0F0740, 0xDEAD,
-       0xFF0F0740, 0xABCD,
-               0x034, 0x0000A0B2,
-               0x034, 0x000090AF,
-               0x034, 0x00008070,
-               0x034, 0x0000706D,
-               0x034, 0x00006050,
-               0x034, 0x0000504D,
-               0x034, 0x0000404A,
-               0x034, 0x00003047,
-               0x034, 0x0000200A,
-               0x034, 0x00001007,
-               0x034, 0x00000004,
-       0xFF0F02C0, 0xCDEF,
-               0x034, 0x0000A0B2,
-               0x034, 0x000090AF,
-               0x034, 0x00008070,
-               0x034, 0x0000706D,
-               0x034, 0x00006050,
-               0x034, 0x0000504D,
-               0x034, 0x0000404A,
-               0x034, 0x00003047,
-               0x034, 0x0000200A,
-               0x034, 0x00001007,
-               0x034, 0x00000004,
-       0xFF0F01C0, 0xCDEF,
-               0x034, 0x0000A0B2,
-               0x034, 0x000090AF,
-               0x034, 0x00008070,
-               0x034, 0x0000706D,
-               0x034, 0x00006050,
-               0x034, 0x0000504D,
-               0x034, 0x0000404A,
-               0x034, 0x00003047,
-               0x034, 0x0000200A,
-               0x034, 0x00001007,
-               0x034, 0x00000004,
-       0xFF0F07D8, 0xCDEF,
+               0x034, 0x00025DE6,
+               0x034, 0x00024DE3,
+               0x034, 0x000238C8,
+               0x034, 0x000228C5,
+               0x034, 0x000218C2,
+               0x034, 0x000208C0,
+       0xB0000000, 0x00000000,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x034, 0x0000A0B2,
                0x034, 0x000090AF,
                0x034, 0x00008070,
@@ -885,69 +766,33 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x034, 0x0000200A,
                0x034, 0x00001007,
                0x034, 0x00000004,
-       0xFF0F07D0, 0xCDEF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
                0x034, 0x0000A0B2,
                0x034, 0x000090AF,
                0x034, 0x00008070,
                0x034, 0x0000706D,
-               0x034, 0x00006050,
-               0x034, 0x0000504D,
-               0x034, 0x0000404A,
-               0x034, 0x00003047,
-               0x034, 0x0000200A,
-               0x034, 0x00001007,
-               0x034, 0x00000004,
-       0xCDCDCDCD, 0xCDCD,
+               0x034, 0x0000604D,
+               0x034, 0x0000504A,
+               0x034, 0x00004047,
+               0x034, 0x00003044,
+               0x034, 0x00002007,
+               0x034, 0x00001004,
+               0x034, 0x00000001,
+       0xA0000000, 0x00000000,
                0x034, 0x0000AFF7,
                0x034, 0x00009DF7,
                0x034, 0x00008DF4,
                0x034, 0x00007DF1,
                0x034, 0x00006DEE,
-               0x034, 0x00005DCD,
-               0x034, 0x00004CEB,
+               0x034, 0x00005DEB,
+               0x034, 0x00004DE8,
                0x034, 0x000038CC,
-               0x034, 0x0000288B,
-               0x034, 0x0000184C,
-               0x034, 0x0000044C,
-       0xFF0F0740, 0xDEAD,
+               0x034, 0x000028C9,
+               0x034, 0x000018C6,
+               0x034, 0x000008C3,
+       0xB0000000, 0x00000000,
                0x0EF, 0x00000000,
-       0xFF0F0740, 0xABCD,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000040,
-               0x035, 0x000001D4,
-               0x035, 0x000081D4,
-               0x035, 0x000101D4,
-               0x035, 0x000201B4,
-               0x035, 0x000281B4,
-               0x035, 0x000301B4,
-               0x035, 0x000401B4,
-               0x035, 0x000481B4,
-               0x035, 0x000501B4,
-       0xFF0F02C0, 0xCDEF,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000040,
-               0x035, 0x000001D4,
-               0x035, 0x000081D4,
-               0x035, 0x000101D4,
-               0x035, 0x000201B4,
-               0x035, 0x000281B4,
-               0x035, 0x000301B4,
-               0x035, 0x000401B4,
-               0x035, 0x000481B4,
-               0x035, 0x000501B4,
-       0xFF0F01C0, 0xCDEF,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000040,
-               0x035, 0x000001D4,
-               0x035, 0x000081D4,
-               0x035, 0x000101D4,
-               0x035, 0x000201B4,
-               0x035, 0x000281B4,
-               0x035, 0x000301B4,
-               0x035, 0x000401B4,
-               0x035, 0x000481B4,
-               0x035, 0x000501B4,
-       0xFF0F07D8, 0xCDEF,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000040,
                0x035, 0x000001D4,
@@ -959,7 +804,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x035, 0x000401B4,
                0x035, 0x000481B4,
                0x035, 0x000501B4,
-       0xFF0F07D0, 0xCDEF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000040,
                0x035, 0x000001D4,
@@ -971,7 +816,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x035, 0x000401B4,
                0x035, 0x000481B4,
                0x035, 0x000501B4,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000040,
                0x035, 0x00000188,
@@ -983,54 +828,9 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x035, 0x000401D8,
                0x035, 0x000481D8,
                0x035, 0x000501D8,
-       0xFF0F0740, 0xDEAD,
+       0xB0000000, 0x00000000,
                0x0EF, 0x00000000,
-       0xFF0F0740, 0xABCD,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000010,
-               0x036, 0x00004BFB,
-               0x036, 0x0000CBFB,
-               0x036, 0x00014BFB,
-               0x036, 0x0001CBFB,
-               0x036, 0x00024F4B,
-               0x036, 0x0002CF4B,
-               0x036, 0x00034F4B,
-               0x036, 0x0003CF4B,
-               0x036, 0x00044F4B,
-               0x036, 0x0004CF4B,
-               0x036, 0x00054F4B,
-               0x036, 0x0005CF4B,
-       0xFF0F02C0, 0xCDEF,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000010,
-               0x036, 0x00004BFB,
-               0x036, 0x0000CBFB,
-               0x036, 0x00014BFB,
-               0x036, 0x0001CBFB,
-               0x036, 0x00024F4B,
-               0x036, 0x0002CF4B,
-               0x036, 0x00034F4B,
-               0x036, 0x0003CF4B,
-               0x036, 0x00044F4B,
-               0x036, 0x0004CF4B,
-               0x036, 0x00054F4B,
-               0x036, 0x0005CF4B,
-       0xFF0F01C0, 0xCDEF,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000010,
-               0x036, 0x00004BFB,
-               0x036, 0x0000CBFB,
-               0x036, 0x00014BFB,
-               0x036, 0x0001CBFB,
-               0x036, 0x00024F4B,
-               0x036, 0x0002CF4B,
-               0x036, 0x00034F4B,
-               0x036, 0x0003CF4B,
-               0x036, 0x00044F4B,
-               0x036, 0x0004CF4B,
-               0x036, 0x00054F4B,
-               0x036, 0x0005CF4B,
-       0xFF0F07D8, 0xCDEF,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000010,
                0x036, 0x00004BFB,
@@ -1045,7 +845,7 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x036, 0x0004CF4B,
                0x036, 0x00054F4B,
                0x036, 0x0005CF4B,
-       0xFF0F07D0, 0xCDEF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000010,
                0x036, 0x00004BFB,
@@ -1060,91 +860,61 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x036, 0x0004CF4B,
                0x036, 0x00054F4B,
                0x036, 0x0005CF4B,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000010,
                0x036, 0x00084EB4,
                0x036, 0x0008CC35,
                0x036, 0x00094C35,
                0x036, 0x0009CC35,
-               0x036, 0x000A4935,
+               0x036, 0x000A4C35,
                0x036, 0x000ACC35,
                0x036, 0x000B4C35,
                0x036, 0x000BCC35,
-               0x036, 0x000C4EB4,
-               0x036, 0x000CCEB5,
-               0x036, 0x000D4EB5,
-               0x036, 0x000DCEB5,
-       0xFF0F0740, 0xDEAD,
+               0x036, 0x000C4C34,
+               0x036, 0x000CCC35,
+               0x036, 0x000D4C35,
+               0x036, 0x000DCC35,
+       0xB0000000, 0x00000000,
                0x0EF, 0x00000000,
                0x0EF, 0x00000008,
-       0xFF0F0740, 0xABCD,
-               0x03C, 0x000002CC,
-               0x03C, 0x00000522,
-               0x03C, 0x00000902,
-       0xFF0F02C0, 0xCDEF,
-               0x03C, 0x000002CC,
-               0x03C, 0x00000522,
-               0x03C, 0x00000902,
-       0xFF0F01C0, 0xCDEF,
-               0x03C, 0x000002CC,
-               0x03C, 0x00000522,
-               0x03C, 0x00000902,
-       0xFF0F07D8, 0xCDEF,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x03C, 0x000002CC,
                0x03C, 0x00000522,
                0x03C, 0x00000902,
-       0xFF0F07D0, 0xCDEF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
                0x03C, 0x000002CC,
                0x03C, 0x00000522,
                0x03C, 0x00000902,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x03C, 0x000002A8,
                0x03C, 0x000005A2,
                0x03C, 0x00000880,
-       0xFF0F0740, 0xDEAD,
+       0xB0000000, 0x00000000,
                0x0EF, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000002,
                0x0DF, 0x00000080,
-               0x01F, 0x00040064,
-       0xFF0F0740, 0xABCD,
-               0x061, 0x000FDD43,
-               0x062, 0x00038F4B,
-               0x063, 0x00032117,
-               0x064, 0x000194AC,
-               0x065, 0x000931D1,
-       0xFF0F02C0, 0xCDEF,
+               0x01F, 0x00000064,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x061, 0x000FDD43,
                0x062, 0x00038F4B,
                0x063, 0x00032117,
                0x064, 0x000194AC,
                0x065, 0x000931D1,
-       0xFF0F01C0, 0xCDEF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
                0x061, 0x000FDD43,
                0x062, 0x00038F4B,
                0x063, 0x00032117,
                0x064, 0x000194AC,
-               0x065, 0x000931D1,
-       0xFF0F07D8, 0xCDEF,
-               0x061, 0x000FDD43,
-               0x062, 0x00038F4B,
-               0x063, 0x00032117,
-               0x064, 0x000194AC,
-               0x065, 0x000931D1,
-       0xFF0F07D0, 0xCDEF,
-               0x061, 0x000FDD43,
-               0x062, 0x00038F4B,
-               0x063, 0x00032117,
-               0x064, 0x000194AC,
-               0x065, 0x000931D1,
-       0xCDCDCDCD, 0xCDCD,
+               0x065, 0x000931D2,
+       0xA0000000, 0x00000000,
                0x061, 0x000E5D53,
                0x062, 0x00038FCD,
-               0x063, 0x000314EB,
+               0x063, 0x000114EB,
                0x064, 0x000196AC,
                0x065, 0x000911D7,
-       0xFF0F0740, 0xDEAD,
+       0xB0000000, 0x00000000,
                0x008, 0x00008400,
                0x01C, 0x000739D2,
                0x0B4, 0x0001E78D,
@@ -1155,29 +925,29 @@ u32 RTL8812AE_RADIOA_ARRAY[] = {
                0x0FE, 0x00000000,
                0x0B4, 0x0001A78D,
                0x018, 0x0001712A,
-
 };
 
+u32 RTL8812AE_RADIOA_1TARRAYLEN = sizeof(RTL8812AE_RADIOA_ARRAY) / sizeof(u32);
+
 u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x056, 0x00051CF2,
                0x066, 0x00040000,
                0x089, 0x00000080,
-       0xFF0F0740, 0xABCD,
-               0x086, 0x00014B38,
-       0xFF0F01C0, 0xCDEF,
-               0x086, 0x00014B38,
-       0xFF0F02C0, 0xCDEF,
-               0x086, 0x00014B38,
-       0xFF0F07D8, 0xCDEF,
+       0x80000001, 0x00000000, 0x40000000, 0x00000000,
                0x086, 0x00014B3A,
-       0xFF0F07D0, 0xCDEF,
+       0x90000001, 0x00000005, 0x40000000, 0x00000000,
                0x086, 0x00014B3A,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x086, 0x00014B38,
-       0xFF0F0740, 0xDEAD,
+       0xB0000000, 0x00000000,
+       0x80000004, 0x00000000, 0x40000000, 0x00000000,
+               0x08B, 0x00080180,
+       0xA0000000, 0x00000000,
+               0x08B, 0x00087180,
+       0xB0000000, 0x00000000,
                0x018, 0x00000006,
                0x0EF, 0x00002000,
-       0xFF0F07D8, 0xABCD,
+       0x80000001, 0x00000000, 0x40000000, 0x00000000,
                0x03B, 0x0003F218,
                0x03B, 0x00030A58,
                0x03B, 0x0002FA58,
@@ -1185,7 +955,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x03B, 0x0001FA50,
                0x03B, 0x00010248,
                0x03B, 0x00008240,
-       0xFF0F07D0, 0xCDEF,
+       0x90000001, 0x00000005, 0x40000000, 0x00000000,
                0x03B, 0x0003F218,
                0x03B, 0x00030A58,
                0x03B, 0x0002FA58,
@@ -1193,7 +963,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x03B, 0x0001FA50,
                0x03B, 0x00010248,
                0x03B, 0x00008240,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x03B, 0x00038A58,
                0x03B, 0x00037A58,
                0x03B, 0x0002A590,
@@ -1201,9 +971,9 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x03B, 0x00018248,
                0x03B, 0x00010240,
                0x03B, 0x00008240,
-       0xFF0F07D8, 0xDEAD,
+       0xB0000000, 0x00000000,
                0x0EF, 0x00000100,
-       0xFF0F07D8, 0xABCD,
+       0x80000002, 0x00000000, 0x40000000, 0x00000000,
                0x034, 0x0000A4EE,
                0x034, 0x00009076,
                0x034, 0x00008073,
@@ -1215,7 +985,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x034, 0x00002028,
                0x034, 0x00001025,
                0x034, 0x00000022,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x034, 0x0000ADF4,
                0x034, 0x00009DF1,
                0x034, 0x00008DEE,
@@ -1227,7 +997,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x034, 0x000024E7,
                0x034, 0x0000146B,
                0x034, 0x0000006D,
-       0xFF0F07D8, 0xDEAD,
+       0xB0000000, 0x00000000,
                0x0EF, 0x00000000,
                0x0EF, 0x000020A2,
                0x0DF, 0x00000080,
@@ -1320,55 +1090,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x03B, 0x00082080,
                0x03C, 0x00010000,
                0x0EF, 0x00001100,
-       0xFF0F0740, 0xABCD,
-               0x034, 0x0004A0B2,
-               0x034, 0x000490AF,
-               0x034, 0x00048070,
-               0x034, 0x0004706D,
-               0x034, 0x00046050,
-               0x034, 0x0004504D,
-               0x034, 0x0004404A,
-               0x034, 0x00043047,
-               0x034, 0x0004200A,
-               0x034, 0x00041007,
-               0x034, 0x00040004,
-       0xFF0F01C0, 0xCDEF,
-               0x034, 0x0004A0B2,
-               0x034, 0x000490AF,
-               0x034, 0x00048070,
-               0x034, 0x0004706D,
-               0x034, 0x00046050,
-               0x034, 0x0004504D,
-               0x034, 0x0004404A,
-               0x034, 0x00043047,
-               0x034, 0x0004200A,
-               0x034, 0x00041007,
-               0x034, 0x00040004,
-       0xFF0F02C0, 0xCDEF,
-               0x034, 0x0004A0B2,
-               0x034, 0x000490AF,
-               0x034, 0x00048070,
-               0x034, 0x0004706D,
-               0x034, 0x00046050,
-               0x034, 0x0004504D,
-               0x034, 0x0004404A,
-               0x034, 0x00043047,
-               0x034, 0x0004200A,
-               0x034, 0x00041007,
-               0x034, 0x00040004,
-       0xFF0F07D8, 0xCDEF,
-               0x034, 0x0004A0B2,
-               0x034, 0x000490AF,
-               0x034, 0x00048070,
-               0x034, 0x0004706D,
-               0x034, 0x00046050,
-               0x034, 0x0004504D,
-               0x034, 0x0004404A,
-               0x034, 0x00043047,
-               0x034, 0x0004200A,
-               0x034, 0x00041007,
-               0x034, 0x00040004,
-       0xFF0F07D0, 0xCDEF,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x034, 0x0004A0B2,
                0x034, 0x000490AF,
                0x034, 0x00048070,
@@ -1380,68 +1102,32 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x034, 0x0004200A,
                0x034, 0x00041007,
                0x034, 0x00040004,
-       0xCDCDCDCD, 0xCDCD,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
+               0x034, 0x0004A0B1,
+               0x034, 0x000490AE,
+               0x034, 0x0004806F,
+               0x034, 0x0004706C,
+               0x034, 0x0004604C,
+               0x034, 0x00045049,
+               0x034, 0x00044046,
+               0x034, 0x00043043,
+               0x034, 0x00042006,
+               0x034, 0x00041003,
+               0x034, 0x00040000,
+       0xA0000000, 0x00000000,
                0x034, 0x0004ADF5,
                0x034, 0x00049DF2,
                0x034, 0x00048DEF,
                0x034, 0x00047DEC,
                0x034, 0x00046DE9,
-               0x034, 0x00045DC9,
-               0x034, 0x00044CE8,
-               0x034, 0x000438CA,
-               0x034, 0x00042889,
-               0x034, 0x0004184A,
-               0x034, 0x0004044A,
-       0xFF0F0740, 0xDEAD,
-       0xFF0F0740, 0xABCD,
-               0x034, 0x0002A0B2,
-               0x034, 0x000290AF,
-               0x034, 0x00028070,
-               0x034, 0x0002706D,
-               0x034, 0x00026050,
-               0x034, 0x0002504D,
-               0x034, 0x0002404A,
-               0x034, 0x00023047,
-               0x034, 0x0002200A,
-               0x034, 0x00021007,
-               0x034, 0x00020004,
-       0xFF0F01C0, 0xCDEF,
-               0x034, 0x0002A0B2,
-               0x034, 0x000290AF,
-               0x034, 0x00028070,
-               0x034, 0x0002706D,
-               0x034, 0x00026050,
-               0x034, 0x0002504D,
-               0x034, 0x0002404A,
-               0x034, 0x00023047,
-               0x034, 0x0002200A,
-               0x034, 0x00021007,
-               0x034, 0x00020004,
-       0xFF0F02C0, 0xCDEF,
-               0x034, 0x0002A0B2,
-               0x034, 0x000290AF,
-               0x034, 0x00028070,
-               0x034, 0x0002706D,
-               0x034, 0x00026050,
-               0x034, 0x0002504D,
-               0x034, 0x0002404A,
-               0x034, 0x00023047,
-               0x034, 0x0002200A,
-               0x034, 0x00021007,
-               0x034, 0x00020004,
-       0xFF0F07D8, 0xCDEF,
-               0x034, 0x0002A0B2,
-               0x034, 0x000290AF,
-               0x034, 0x00028070,
-               0x034, 0x0002706D,
-               0x034, 0x00026050,
-               0x034, 0x0002504D,
-               0x034, 0x0002404A,
-               0x034, 0x00023047,
-               0x034, 0x0002200A,
-               0x034, 0x00021007,
-               0x034, 0x00020004,
-       0xFF0F07D0, 0xCDEF,
+               0x034, 0x00045DE6,
+               0x034, 0x00044DE3,
+               0x034, 0x000438C8,
+               0x034, 0x000428C5,
+               0x034, 0x000418C2,
+               0x034, 0x000408C0,
+       0xB0000000, 0x00000000,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x034, 0x0002A0B2,
                0x034, 0x000290AF,
                0x034, 0x00028070,
@@ -1453,32 +1139,32 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x034, 0x0002200A,
                0x034, 0x00021007,
                0x034, 0x00020004,
-       0xCDCDCDCD, 0xCDCD,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
+               0x034, 0x0002A0B3,
+               0x034, 0x000290B0,
+               0x034, 0x00028071,
+               0x034, 0x0002706E,
+               0x034, 0x0002604E,
+               0x034, 0x0002504B,
+               0x034, 0x00024048,
+               0x034, 0x00023045,
+               0x034, 0x00022008,
+               0x034, 0x00021005,
+               0x034, 0x00020002,
+       0xA0000000, 0x00000000,
                0x034, 0x0002ADF5,
                0x034, 0x00029DF2,
                0x034, 0x00028DEF,
                0x034, 0x00027DEC,
                0x034, 0x00026DE9,
-               0x034, 0x00025DC9,
-               0x034, 0x00024CE8,
-               0x034, 0x000238CA,
-               0x034, 0x00022889,
-               0x034, 0x0002184A,
-               0x034, 0x0002044A,
-       0xFF0F0740, 0xDEAD,
-       0xFF0F0740, 0xABCD,
-               0x034, 0x0000A0B2,
-               0x034, 0x000090AF,
-               0x034, 0x00008070,
-               0x034, 0x0000706D,
-               0x034, 0x00006050,
-               0x034, 0x0000504D,
-               0x034, 0x0000404A,
-               0x034, 0x00003047,
-               0x034, 0x0000200A,
-               0x034, 0x00001007,
-               0x034, 0x00000004,
-       0xFF0F01C0, 0xCDEF,
+               0x034, 0x00025DE6,
+               0x034, 0x00024DE3,
+               0x034, 0x000238C8,
+               0x034, 0x000228C5,
+               0x034, 0x000218C2,
+               0x034, 0x000208C0,
+       0xB0000000, 0x00000000,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x034, 0x0000A0B2,
                0x034, 0x000090AF,
                0x034, 0x00008070,
@@ -1490,96 +1176,33 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x034, 0x0000200A,
                0x034, 0x00001007,
                0x034, 0x00000004,
-       0xFF0F02C0, 0xCDEF,
-               0x034, 0x0000A0B2,
-               0x034, 0x000090AF,
-               0x034, 0x00008070,
-               0x034, 0x0000706D,
-               0x034, 0x00006050,
-               0x034, 0x0000504D,
-               0x034, 0x0000404A,
-               0x034, 0x00003047,
-               0x034, 0x0000200A,
-               0x034, 0x00001007,
-               0x034, 0x00000004,
-       0xFF0F07D8, 0xCDEF,
-               0x034, 0x0000A0B2,
-               0x034, 0x000090AF,
-               0x034, 0x00008070,
-               0x034, 0x0000706D,
-               0x034, 0x00006050,
-               0x034, 0x0000504D,
-               0x034, 0x0000404A,
-               0x034, 0x00003047,
-               0x034, 0x0000200A,
-               0x034, 0x00001007,
-               0x034, 0x00000004,
-       0xFF0F07D0, 0xCDEF,
-               0x034, 0x0000A0B2,
-               0x034, 0x000090AF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
+               0x034, 0x0000A0B3,
+               0x034, 0x000090B0,
                0x034, 0x00008070,
                0x034, 0x0000706D,
-               0x034, 0x00006050,
-               0x034, 0x0000504D,
-               0x034, 0x0000404A,
-               0x034, 0x00003047,
-               0x034, 0x0000200A,
-               0x034, 0x00001007,
-               0x034, 0x00000004,
-       0xCDCDCDCD, 0xCDCD,
+               0x034, 0x0000604D,
+               0x034, 0x0000504A,
+               0x034, 0x00004047,
+               0x034, 0x00003044,
+               0x034, 0x00002007,
+               0x034, 0x00001004,
+               0x034, 0x00000001,
+       0xA0000000, 0x00000000,
                0x034, 0x0000AFF7,
                0x034, 0x00009DF7,
                0x034, 0x00008DF4,
                0x034, 0x00007DF1,
                0x034, 0x00006DEE,
-               0x034, 0x00005DCD,
-               0x034, 0x00004CEB,
+               0x034, 0x00005DEB,
+               0x034, 0x00004DE8,
                0x034, 0x000038CC,
-               0x034, 0x0000288B,
-               0x034, 0x0000184C,
-               0x034, 0x0000044C,
-       0xFF0F0740, 0xDEAD,
-               0x0EF, 0x00000000,
-       0xFF0F0740, 0xABCD,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000040,
-               0x035, 0x000001C5,
-               0x035, 0x000081C5,
-               0x035, 0x000101C5,
-               0x035, 0x00020174,
-               0x035, 0x00028174,
-               0x035, 0x00030174,
-               0x035, 0x00040185,
-               0x035, 0x00048185,
-               0x035, 0x00050185,
-               0x0EF, 0x00000000,
-       0xFF0F01C0, 0xCDEF,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000040,
-               0x035, 0x000001C5,
-               0x035, 0x000081C5,
-               0x035, 0x000101C5,
-               0x035, 0x00020174,
-               0x035, 0x00028174,
-               0x035, 0x00030174,
-               0x035, 0x00040185,
-               0x035, 0x00048185,
-               0x035, 0x00050185,
-               0x0EF, 0x00000000,
-       0xFF0F02C0, 0xCDEF,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000040,
-               0x035, 0x000001C5,
-               0x035, 0x000081C5,
-               0x035, 0x000101C5,
-               0x035, 0x00020174,
-               0x035, 0x00028174,
-               0x035, 0x00030174,
-               0x035, 0x00040185,
-               0x035, 0x00048185,
-               0x035, 0x00050185,
+               0x034, 0x000028C9,
+               0x034, 0x000018C6,
+               0x034, 0x000008C3,
+       0xB0000000, 0x00000000,
                0x0EF, 0x00000000,
-       0xFF0F07D8, 0xCDEF,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000040,
                0x035, 0x000001C5,
@@ -1592,7 +1215,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x035, 0x00048185,
                0x035, 0x00050185,
                0x0EF, 0x00000000,
-       0xFF0F07D0, 0xCDEF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000040,
                0x035, 0x000001C5,
@@ -1605,66 +1228,21 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x035, 0x00048185,
                0x035, 0x00050185,
                0x0EF, 0x00000000,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000040,
-               0x035, 0x00000186,
-               0x035, 0x00008186,
-               0x035, 0x00010185,
-               0x035, 0x000201D5,
-               0x035, 0x000281D5,
-               0x035, 0x000301D5,
-               0x035, 0x000401D5,
-               0x035, 0x000481D5,
-               0x035, 0x000501D5,
+               0x035, 0x00000188,
+               0x035, 0x00008147,
+               0x035, 0x00010147,
+               0x035, 0x000201D7,
+               0x035, 0x000281D7,
+               0x035, 0x000301D7,
+               0x035, 0x000401D8,
+               0x035, 0x000481D8,
+               0x035, 0x000501D8,
                0x0EF, 0x00000000,
-       0xFF0F0740, 0xDEAD,
-       0xFF0F0740, 0xABCD,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000010,
-               0x036, 0x00005B8B,
-               0x036, 0x0000DB8B,
-               0x036, 0x00015B8B,
-               0x036, 0x0001DB8B,
-               0x036, 0x000262DB,
-               0x036, 0x0002E2DB,
-               0x036, 0x000362DB,
-               0x036, 0x0003E2DB,
-               0x036, 0x0004553B,
-               0x036, 0x0004D53B,
-               0x036, 0x0005553B,
-               0x036, 0x0005D53B,
-       0xFF0F01C0, 0xCDEF,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000010,
-               0x036, 0x00005B8B,
-               0x036, 0x0000DB8B,
-               0x036, 0x00015B8B,
-               0x036, 0x0001DB8B,
-               0x036, 0x000262DB,
-               0x036, 0x0002E2DB,
-               0x036, 0x000362DB,
-               0x036, 0x0003E2DB,
-               0x036, 0x0004553B,
-               0x036, 0x0004D53B,
-               0x036, 0x0005553B,
-               0x036, 0x0005D53B,
-       0xFF0F02C0, 0xCDEF,
-               0x018, 0x0001712A,
-               0x0EF, 0x00000010,
-               0x036, 0x00005B8B,
-               0x036, 0x0000DB8B,
-               0x036, 0x00015B8B,
-               0x036, 0x0001DB8B,
-               0x036, 0x000262DB,
-               0x036, 0x0002E2DB,
-               0x036, 0x000362DB,
-               0x036, 0x0003E2DB,
-               0x036, 0x0004553B,
-               0x036, 0x0004D53B,
-               0x036, 0x0005553B,
-               0x036, 0x0005D53B,
-       0xFF0F07D8, 0xCDEF,
+       0xB0000000, 0x00000000,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000010,
                0x036, 0x00005B8B,
@@ -1679,7 +1257,7 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x036, 0x0004D53B,
                0x036, 0x0005553B,
                0x036, 0x0005D53B,
-       0xFF0F07D0, 0xCDEF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000010,
                0x036, 0x00005B8B,
@@ -1694,94 +1272,71 @@ u32 RTL8812AE_RADIOB_ARRAY[] = {
                0x036, 0x0004D53B,
                0x036, 0x0005553B,
                0x036, 0x0005D53B,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000010,
                0x036, 0x00084EB4,
-               0x036, 0x0008C9B4,
-               0x036, 0x000949B4,
-               0x036, 0x0009C9B4,
-               0x036, 0x000A4935,
-               0x036, 0x000AC935,
-               0x036, 0x000B4935,
-               0x036, 0x000BC935,
-               0x036, 0x000C4EB4,
-               0x036, 0x000CCEB4,
-               0x036, 0x000D4EB4,
-               0x036, 0x000DCEB4,
-       0xFF0F0740, 0xDEAD,
-               0x0EF, 0x00000000,
-               0x0EF, 0x00000008,
-       0xFF0F0740, 0xABCD,
-               0x03C, 0x000002DC,
-               0x03C, 0x00000524,
-               0x03C, 0x00000902,
-       0xFF0F01C0, 0xCDEF,
-               0x03C, 0x000002DC,
-               0x03C, 0x00000524,
-               0x03C, 0x00000902,
-       0xFF0F02C0, 0xCDEF,
-               0x03C, 0x000002DC,
-               0x03C, 0x00000524,
-               0x03C, 0x00000902,
-       0xFF0F07D8, 0xCDEF,
+               0x036, 0x0008CC35,
+               0x036, 0x00094C35,
+               0x036, 0x0009CC35,
+               0x036, 0x000A4C35,
+               0x036, 0x000ACC35,
+               0x036, 0x000B4C35,
+               0x036, 0x000BCC35,
+               0x036, 0x000C4C34,
+               0x036, 0x000CCC35,
+               0x036, 0x000D4C35,
+               0x036, 0x000DCC35,
+       0xB0000000, 0x00000000,
+               0x0EF, 0x00000000,
+               0x0EF, 0x00000008,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x03C, 0x000002DC,
                0x03C, 0x00000524,
                0x03C, 0x00000902,
-       0xFF0F07D0, 0xCDEF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
                0x03C, 0x000002DC,
                0x03C, 0x00000524,
                0x03C, 0x00000902,
-       0xCDCDCDCD, 0xCDCD,
-               0x03C, 0x000002AA,
+       0xA0000000, 0x00000000,
+               0x03C, 0x000002A8,
                0x03C, 0x000005A2,
                0x03C, 0x00000880,
-       0xFF0F0740, 0xDEAD,
+       0xB0000000, 0x00000000,
                0x0EF, 0x00000000,
                0x018, 0x0001712A,
                0x0EF, 0x00000002,
                0x0DF, 0x00000080,
-       0xFF0F0740, 0xABCD,
-               0x061, 0x000EAC43,
-               0x062, 0x00038F47,
-               0x063, 0x00031157,
-               0x064, 0x0001C4AC,
-               0x065, 0x000931D1,
-       0xFF0F01C0, 0xCDEF,
-               0x061, 0x000EAC43,
-               0x062, 0x00038F47,
-               0x063, 0x00031157,
-               0x064, 0x0001C4AC,
-               0x065, 0x000931D1,
-       0xFF0F02C0, 0xCDEF,
+       0x80000008, 0x00000000, 0x40000000, 0x00000000,
                0x061, 0x000EAC43,
                0x062, 0x00038F47,
                0x063, 0x00031157,
                0x064, 0x0001C4AC,
                0x065, 0x000931D1,
-       0xFF0F07D8, 0xCDEF,
+       0x90000008, 0x05000000, 0x40000000, 0x00000000,
                0x061, 0x000EAC43,
                0x062, 0x00038F47,
                0x063, 0x00031157,
                0x064, 0x0001C4AC,
-               0x065, 0x000931D1,
-       0xFF0F07D0, 0xCDEF,
+               0x065, 0x000931D2,
+       0x90000002, 0x00000000, 0x40000000, 0x00000000,
                0x061, 0x000EAC43,
                0x062, 0x00038F47,
                0x063, 0x00031157,
                0x064, 0x0001C4AC,
                0x065, 0x000931D1,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x061, 0x000E5D53,
                0x062, 0x00038FCD,
-               0x063, 0x000314EB,
+               0x063, 0x000114EB,
                0x064, 0x000196AC,
-               0x065, 0x000931D7,
-       0xFF0F0740, 0xDEAD,
+               0x065, 0x000911D7,
+       0xB0000000, 0x00000000,
                0x008, 0x00008400,
-
 };
 
+u32 RTL8812AE_RADIOB_1TARRAYLEN = sizeof(RTL8812AE_RADIOB_ARRAY) / sizeof(u32);
+
 u32 RTL8821AE_RADIOA_ARRAY[] = {
                0x018, 0x0001712A,
                0x056, 0x00051CF2,
@@ -2378,14 +1933,14 @@ u32 RTL8821AE_RADIOA_1TARRAYLEN = sizeof(RTL8821AE_RADIOA_ARRAY) / sizeof(u32);
 
 u32 RTL8812AE_MAC_REG_ARRAY[] = {
                0x010, 0x0000000C,
-       0xFF0F0180, 0xABCD,
+       0x80000200, 0x00000000, 0x40000000, 0x00000000,
+               0x011, 0x00000066,
+       0xA0000000, 0x00000000,
+               0x011, 0x0000005A,
+       0xB0000000, 0x00000000,
                0x025, 0x0000000F,
-       0xFF0F01C0, 0xCDEF,
-               0x025, 0x0000000F,
-       0xCDCDCDCD, 0xCDCD,
-               0x025, 0x0000006F,
-       0xFF0F0180, 0xDEAD,
                0x072, 0x00000000,
+               0x420, 0x00000080,
                0x428, 0x0000000A,
                0x429, 0x00000010,
                0x430, 0x00000000,
@@ -2452,7 +2007,7 @@ u32 RTL8812AE_MAC_REG_ARRAY[] = {
                0x559, 0x00000002,
                0x55C, 0x00000050,
                0x55D, 0x000000FF,
-               0x604, 0x00000001,
+               0x604, 0x00000009,
                0x605, 0x00000030,
                0x607, 0x00000003,
                0x608, 0x0000000E,
@@ -2484,9 +2039,10 @@ u32 RTL8812AE_MAC_REG_ARRAY[] = {
                0x70A, 0x00000065,
                0x70B, 0x00000087,
                0x718, 0x00000040,
-
 };
 
+u32 RTL8812AE_MAC_1T_ARRAYLEN = sizeof(RTL8812AE_MAC_REG_ARRAY) / sizeof(u32);
+
 u32 RTL8821AE_MAC_REG_ARRAY[] = {
                0x428, 0x0000000A,
                0x429, 0x00000010,
@@ -2533,585 +2089,260 @@ u32 RTL8821AE_MAC_REG_ARRAY[] = {
                0x501, 0x000000A2,
                0x502, 0x0000002F,
                0x503, 0x00000000,
-               0x504, 0x00000028,
-               0x505, 0x000000A3,
-               0x506, 0x0000005E,
-               0x507, 0x00000000,
-               0x508, 0x0000002B,
-               0x509, 0x000000A4,
-               0x50A, 0x0000005E,
-               0x50B, 0x00000000,
-               0x50C, 0x0000004F,
-               0x50D, 0x000000A4,
-               0x50E, 0x00000000,
-               0x50F, 0x00000000,
-               0x512, 0x0000001C,
-               0x514, 0x0000000A,
-               0x516, 0x0000000A,
-               0x525, 0x0000004F,
-               0x550, 0x00000010,
-               0x551, 0x00000010,
-               0x559, 0x00000002,
-               0x55C, 0x00000050,
-               0x55D, 0x000000FF,
-               0x605, 0x00000030,
-               0x607, 0x00000007,
-               0x608, 0x0000000E,
-               0x609, 0x0000002A,
-               0x620, 0x000000FF,
-               0x621, 0x000000FF,
-               0x622, 0x000000FF,
-               0x623, 0x000000FF,
-               0x624, 0x000000FF,
-               0x625, 0x000000FF,
-               0x626, 0x000000FF,
-               0x627, 0x000000FF,
-               0x638, 0x00000050,
-               0x63C, 0x0000000A,
-               0x63D, 0x0000000A,
-               0x63E, 0x0000000E,
-               0x63F, 0x0000000E,
-               0x640, 0x00000040,
-               0x642, 0x00000040,
-               0x643, 0x00000000,
-               0x652, 0x000000C8,
-               0x66E, 0x00000005,
-               0x700, 0x00000021,
-               0x701, 0x00000043,
-               0x702, 0x00000065,
-               0x703, 0x00000087,
-               0x708, 0x00000021,
-               0x709, 0x00000043,
-               0x70A, 0x00000065,
-               0x70B, 0x00000087,
-               0x718, 0x00000040,
-};
-
-u32 RTL8821AE_MAC_1T_ARRAYLEN = sizeof(RTL8821AE_MAC_REG_ARRAY) / sizeof(u32);
-
-u32 RTL8812AE_AGC_TAB_ARRAY[] = {
-       0xFF0F07D8, 0xABCD,
-               0x81C, 0xFC000001,
-               0x81C, 0xFB020001,
-               0x81C, 0xFA040001,
-               0x81C, 0xF9060001,
-               0x81C, 0xF8080001,
-               0x81C, 0xF70A0001,
-               0x81C, 0xF60C0001,
-               0x81C, 0xF50E0001,
-               0x81C, 0xF4100001,
-               0x81C, 0xF3120001,
-               0x81C, 0xF2140001,
-               0x81C, 0xF1160001,
-               0x81C, 0xF0180001,
-               0x81C, 0xEF1A0001,
-               0x81C, 0xEE1C0001,
-               0x81C, 0xED1E0001,
-               0x81C, 0xEC200001,
-               0x81C, 0xEB220001,
-               0x81C, 0xEA240001,
-               0x81C, 0xCD260001,
-               0x81C, 0xCC280001,
-               0x81C, 0xCB2A0001,
-               0x81C, 0xCA2C0001,
-               0x81C, 0xC92E0001,
-               0x81C, 0xC8300001,
-               0x81C, 0xA6320001,
-               0x81C, 0xA5340001,
-               0x81C, 0xA4360001,
-               0x81C, 0xA3380001,
-               0x81C, 0xA23A0001,
-               0x81C, 0x883C0001,
-               0x81C, 0x873E0001,
-               0x81C, 0x86400001,
-               0x81C, 0x85420001,
-               0x81C, 0x84440001,
-               0x81C, 0x83460001,
-               0x81C, 0x82480001,
-               0x81C, 0x814A0001,
-               0x81C, 0x484C0001,
-               0x81C, 0x474E0001,
-               0x81C, 0x46500001,
-               0x81C, 0x45520001,
-               0x81C, 0x44540001,
-               0x81C, 0x43560001,
-               0x81C, 0x42580001,
-               0x81C, 0x415A0001,
-               0x81C, 0x255C0001,
-               0x81C, 0x245E0001,
-               0x81C, 0x23600001,
-               0x81C, 0x22620001,
-               0x81C, 0x21640001,
-               0x81C, 0x21660001,
-               0x81C, 0x21680001,
-               0x81C, 0x216A0001,
-               0x81C, 0x216C0001,
-               0x81C, 0x216E0001,
-               0x81C, 0x21700001,
-               0x81C, 0x21720001,
-               0x81C, 0x21740001,
-               0x81C, 0x21760001,
-               0x81C, 0x21780001,
-               0x81C, 0x217A0001,
-               0x81C, 0x217C0001,
-               0x81C, 0x217E0001,
-       0xFF0F07D0, 0xCDEF,
-               0x81C, 0xF9000001,
-               0x81C, 0xF8020001,
-               0x81C, 0xF7040001,
-               0x81C, 0xF6060001,
-               0x81C, 0xF5080001,
-               0x81C, 0xF40A0001,
-               0x81C, 0xF30C0001,
-               0x81C, 0xF20E0001,
-               0x81C, 0xF1100001,
-               0x81C, 0xF0120001,
-               0x81C, 0xEF140001,
-               0x81C, 0xEE160001,
-               0x81C, 0xED180001,
-               0x81C, 0xEC1A0001,
-               0x81C, 0xEB1C0001,
-               0x81C, 0xEA1E0001,
-               0x81C, 0xCD200001,
-               0x81C, 0xCC220001,
-               0x81C, 0xCB240001,
-               0x81C, 0xCA260001,
-               0x81C, 0xC9280001,
-               0x81C, 0xC82A0001,
-               0x81C, 0xC72C0001,
-               0x81C, 0xC62E0001,
-               0x81C, 0xA5300001,
-               0x81C, 0xA4320001,
-               0x81C, 0xA3340001,
-               0x81C, 0xA2360001,
-               0x81C, 0x88380001,
-               0x81C, 0x873A0001,
-               0x81C, 0x863C0001,
-               0x81C, 0x853E0001,
-               0x81C, 0x84400001,
-               0x81C, 0x83420001,
-               0x81C, 0x82440001,
-               0x81C, 0x81460001,
-               0x81C, 0x48480001,
-               0x81C, 0x474A0001,
-               0x81C, 0x464C0001,
-               0x81C, 0x454E0001,
-               0x81C, 0x44500001,
-               0x81C, 0x43520001,
-               0x81C, 0x42540001,
-               0x81C, 0x41560001,
-               0x81C, 0x25580001,
-               0x81C, 0x245A0001,
-               0x81C, 0x235C0001,
-               0x81C, 0x225E0001,
-               0x81C, 0x21600001,
-               0x81C, 0x21620001,
-               0x81C, 0x21640001,
-               0x81C, 0x21660001,
-               0x81C, 0x21680001,
-               0x81C, 0x216A0001,
-               0x81C, 0x236C0001,
-               0x81C, 0x226E0001,
-               0x81C, 0x21700001,
-               0x81C, 0x21720001,
-               0x81C, 0x21740001,
-               0x81C, 0x21760001,
-               0x81C, 0x21780001,
-               0x81C, 0x217A0001,
-               0x81C, 0x217C0001,
-               0x81C, 0x217E0001,
-       0xCDCDCDCD, 0xCDCD,
-               0x81C, 0xFF000001,
-               0x81C, 0xFF020001,
-               0x81C, 0xFF040001,
-               0x81C, 0xFF060001,
-               0x81C, 0xFF080001,
-               0x81C, 0xFE0A0001,
-               0x81C, 0xFD0C0001,
-               0x81C, 0xFC0E0001,
-               0x81C, 0xFB100001,
-               0x81C, 0xFA120001,
-               0x81C, 0xF9140001,
-               0x81C, 0xF8160001,
-               0x81C, 0xF7180001,
-               0x81C, 0xF61A0001,
-               0x81C, 0xF51C0001,
-               0x81C, 0xF41E0001,
-               0x81C, 0xF3200001,
-               0x81C, 0xF2220001,
-               0x81C, 0xF1240001,
-               0x81C, 0xF0260001,
-               0x81C, 0xEF280001,
-               0x81C, 0xEE2A0001,
-               0x81C, 0xED2C0001,
-               0x81C, 0xEC2E0001,
-               0x81C, 0xEB300001,
-               0x81C, 0xEA320001,
-               0x81C, 0xE9340001,
-               0x81C, 0xE8360001,
-               0x81C, 0xE7380001,
-               0x81C, 0xE63A0001,
-               0x81C, 0xE53C0001,
-               0x81C, 0xC73E0001,
-               0x81C, 0xC6400001,
-               0x81C, 0xC5420001,
-               0x81C, 0xC4440001,
-               0x81C, 0xC3460001,
-               0x81C, 0xC2480001,
-               0x81C, 0xC14A0001,
-               0x81C, 0xA74C0001,
-               0x81C, 0xA64E0001,
-               0x81C, 0xA5500001,
-               0x81C, 0xA4520001,
-               0x81C, 0xA3540001,
-               0x81C, 0xA2560001,
-               0x81C, 0xA1580001,
-               0x81C, 0x675A0001,
-               0x81C, 0x665C0001,
-               0x81C, 0x655E0001,
-               0x81C, 0x64600001,
-               0x81C, 0x63620001,
-               0x81C, 0x48640001,
-               0x81C, 0x47660001,
-               0x81C, 0x46680001,
-               0x81C, 0x456A0001,
-               0x81C, 0x446C0001,
-               0x81C, 0x436E0001,
-               0x81C, 0x42700001,
-               0x81C, 0x41720001,
-               0x81C, 0x41740001,
-               0x81C, 0x41760001,
-               0x81C, 0x41780001,
-               0x81C, 0x417A0001,
-               0x81C, 0x417C0001,
-               0x81C, 0x417E0001,
-       0xFF0F07D8, 0xDEAD,
-       0xFF0F0180, 0xABCD,
-               0x81C, 0xFC800001,
-               0x81C, 0xFB820001,
-               0x81C, 0xFA840001,
-               0x81C, 0xF9860001,
-               0x81C, 0xF8880001,
-               0x81C, 0xF78A0001,
-               0x81C, 0xF68C0001,
-               0x81C, 0xF58E0001,
-               0x81C, 0xF4900001,
-               0x81C, 0xF3920001,
-               0x81C, 0xF2940001,
-               0x81C, 0xF1960001,
-               0x81C, 0xF0980001,
-               0x81C, 0xEF9A0001,
-               0x81C, 0xEE9C0001,
-               0x81C, 0xED9E0001,
-               0x81C, 0xECA00001,
-               0x81C, 0xEBA20001,
-               0x81C, 0xEAA40001,
-               0x81C, 0xE9A60001,
-               0x81C, 0xE8A80001,
-               0x81C, 0xE7AA0001,
-               0x81C, 0xE6AC0001,
-               0x81C, 0xE5AE0001,
-               0x81C, 0xE4B00001,
-               0x81C, 0xE3B20001,
-               0x81C, 0xA8B40001,
-               0x81C, 0xA7B60001,
-               0x81C, 0xA6B80001,
-               0x81C, 0xA5BA0001,
-               0x81C, 0xA4BC0001,
-               0x81C, 0xA3BE0001,
-               0x81C, 0xA2C00001,
-               0x81C, 0xA1C20001,
-               0x81C, 0x68C40001,
-               0x81C, 0x67C60001,
-               0x81C, 0x66C80001,
-               0x81C, 0x65CA0001,
-               0x81C, 0x64CC0001,
-               0x81C, 0x47CE0001,
-               0x81C, 0x46D00001,
-               0x81C, 0x45D20001,
-               0x81C, 0x44D40001,
-               0x81C, 0x43D60001,
-               0x81C, 0x42D80001,
-               0x81C, 0x08DA0001,
-               0x81C, 0x07DC0001,
-               0x81C, 0x06DE0001,
-               0x81C, 0x05E00001,
-               0x81C, 0x04E20001,
-               0x81C, 0x03E40001,
-               0x81C, 0x02E60001,
-               0x81C, 0x01E80001,
-               0x81C, 0x01EA0001,
-               0x81C, 0x01EC0001,
-               0x81C, 0x01EE0001,
-               0x81C, 0x01F00001,
-               0x81C, 0x01F20001,
-               0x81C, 0x01F40001,
-               0x81C, 0x01F60001,
-               0x81C, 0x01F80001,
-               0x81C, 0x01FA0001,
-               0x81C, 0x01FC0001,
-               0x81C, 0x01FE0001,
-       0xFF0F0280, 0xCDEF,
-               0x81C, 0xFC800001,
-               0x81C, 0xFB820001,
-               0x81C, 0xFA840001,
-               0x81C, 0xF9860001,
-               0x81C, 0xF8880001,
-               0x81C, 0xF78A0001,
-               0x81C, 0xF68C0001,
-               0x81C, 0xF58E0001,
-               0x81C, 0xF4900001,
-               0x81C, 0xF3920001,
-               0x81C, 0xF2940001,
-               0x81C, 0xF1960001,
-               0x81C, 0xF0980001,
-               0x81C, 0xEF9A0001,
-               0x81C, 0xEE9C0001,
-               0x81C, 0xED9E0001,
-               0x81C, 0xECA00001,
-               0x81C, 0xEBA20001,
-               0x81C, 0xEAA40001,
-               0x81C, 0xE9A60001,
-               0x81C, 0xE8A80001,
-               0x81C, 0xE7AA0001,
-               0x81C, 0xE6AC0001,
-               0x81C, 0xE5AE0001,
-               0x81C, 0xE4B00001,
-               0x81C, 0xE3B20001,
-               0x81C, 0xA8B40001,
-               0x81C, 0xA7B60001,
-               0x81C, 0xA6B80001,
-               0x81C, 0xA5BA0001,
-               0x81C, 0xA4BC0001,
-               0x81C, 0xA3BE0001,
-               0x81C, 0xA2C00001,
-               0x81C, 0xA1C20001,
-               0x81C, 0x68C40001,
-               0x81C, 0x67C60001,
-               0x81C, 0x66C80001,
-               0x81C, 0x65CA0001,
-               0x81C, 0x64CC0001,
-               0x81C, 0x47CE0001,
-               0x81C, 0x46D00001,
-               0x81C, 0x45D20001,
-               0x81C, 0x44D40001,
-               0x81C, 0x43D60001,
-               0x81C, 0x42D80001,
-               0x81C, 0x08DA0001,
-               0x81C, 0x07DC0001,
-               0x81C, 0x06DE0001,
-               0x81C, 0x05E00001,
-               0x81C, 0x04E20001,
-               0x81C, 0x03E40001,
-               0x81C, 0x02E60001,
-               0x81C, 0x01E80001,
-               0x81C, 0x01EA0001,
-               0x81C, 0x01EC0001,
-               0x81C, 0x01EE0001,
-               0x81C, 0x01F00001,
-               0x81C, 0x01F20001,
-               0x81C, 0x01F40001,
-               0x81C, 0x01F60001,
-               0x81C, 0x01F80001,
-               0x81C, 0x01FA0001,
-               0x81C, 0x01FC0001,
-               0x81C, 0x01FE0001,
-       0xFF0F01C0, 0xCDEF,
-               0x81C, 0xFC800001,
-               0x81C, 0xFB820001,
-               0x81C, 0xFA840001,
-               0x81C, 0xF9860001,
-               0x81C, 0xF8880001,
-               0x81C, 0xF78A0001,
-               0x81C, 0xF68C0001,
-               0x81C, 0xF58E0001,
-               0x81C, 0xF4900001,
-               0x81C, 0xF3920001,
-               0x81C, 0xF2940001,
-               0x81C, 0xF1960001,
-               0x81C, 0xF0980001,
-               0x81C, 0xEF9A0001,
-               0x81C, 0xEE9C0001,
-               0x81C, 0xED9E0001,
-               0x81C, 0xECA00001,
-               0x81C, 0xEBA20001,
-               0x81C, 0xEAA40001,
-               0x81C, 0xE9A60001,
-               0x81C, 0xE8A80001,
-               0x81C, 0xE7AA0001,
-               0x81C, 0xE6AC0001,
-               0x81C, 0xE5AE0001,
-               0x81C, 0xE4B00001,
-               0x81C, 0xE3B20001,
-               0x81C, 0xA8B40001,
-               0x81C, 0xA7B60001,
-               0x81C, 0xA6B80001,
-               0x81C, 0xA5BA0001,
-               0x81C, 0xA4BC0001,
-               0x81C, 0xA3BE0001,
-               0x81C, 0xA2C00001,
-               0x81C, 0xA1C20001,
-               0x81C, 0x68C40001,
-               0x81C, 0x67C60001,
-               0x81C, 0x66C80001,
-               0x81C, 0x65CA0001,
-               0x81C, 0x64CC0001,
-               0x81C, 0x47CE0001,
-               0x81C, 0x46D00001,
-               0x81C, 0x45D20001,
-               0x81C, 0x44D40001,
-               0x81C, 0x43D60001,
-               0x81C, 0x42D80001,
-               0x81C, 0x08DA0001,
-               0x81C, 0x07DC0001,
-               0x81C, 0x06DE0001,
-               0x81C, 0x05E00001,
-               0x81C, 0x04E20001,
-               0x81C, 0x03E40001,
-               0x81C, 0x02E60001,
-               0x81C, 0x01E80001,
-               0x81C, 0x01EA0001,
-               0x81C, 0x01EC0001,
-               0x81C, 0x01EE0001,
-               0x81C, 0x01F00001,
-               0x81C, 0x01F20001,
-               0x81C, 0x01F40001,
-               0x81C, 0x01F60001,
-               0x81C, 0x01F80001,
-               0x81C, 0x01FA0001,
-               0x81C, 0x01FC0001,
-               0x81C, 0x01FE0001,
-       0xFF0F02C0, 0xCDEF,
-               0x81C, 0xFC800001,
-               0x81C, 0xFB820001,
-               0x81C, 0xFA840001,
-               0x81C, 0xF9860001,
-               0x81C, 0xF8880001,
-               0x81C, 0xF78A0001,
-               0x81C, 0xF68C0001,
-               0x81C, 0xF58E0001,
-               0x81C, 0xF4900001,
-               0x81C, 0xF3920001,
-               0x81C, 0xF2940001,
-               0x81C, 0xF1960001,
-               0x81C, 0xF0980001,
-               0x81C, 0xEF9A0001,
-               0x81C, 0xEE9C0001,
-               0x81C, 0xED9E0001,
-               0x81C, 0xECA00001,
-               0x81C, 0xEBA20001,
-               0x81C, 0xEAA40001,
-               0x81C, 0xE9A60001,
-               0x81C, 0xE8A80001,
-               0x81C, 0xE7AA0001,
-               0x81C, 0xE6AC0001,
-               0x81C, 0xE5AE0001,
-               0x81C, 0xE4B00001,
-               0x81C, 0xE3B20001,
-               0x81C, 0xA8B40001,
-               0x81C, 0xA7B60001,
-               0x81C, 0xA6B80001,
-               0x81C, 0xA5BA0001,
-               0x81C, 0xA4BC0001,
-               0x81C, 0xA3BE0001,
-               0x81C, 0xA2C00001,
-               0x81C, 0xA1C20001,
-               0x81C, 0x68C40001,
-               0x81C, 0x67C60001,
-               0x81C, 0x66C80001,
-               0x81C, 0x65CA0001,
-               0x81C, 0x64CC0001,
-               0x81C, 0x47CE0001,
-               0x81C, 0x46D00001,
-               0x81C, 0x45D20001,
-               0x81C, 0x44D40001,
-               0x81C, 0x43D60001,
-               0x81C, 0x42D80001,
-               0x81C, 0x08DA0001,
-               0x81C, 0x07DC0001,
-               0x81C, 0x06DE0001,
-               0x81C, 0x05E00001,
-               0x81C, 0x04E20001,
-               0x81C, 0x03E40001,
-               0x81C, 0x02E60001,
-               0x81C, 0x01E80001,
-               0x81C, 0x01EA0001,
-               0x81C, 0x01EC0001,
-               0x81C, 0x01EE0001,
-               0x81C, 0x01F00001,
-               0x81C, 0x01F20001,
-               0x81C, 0x01F40001,
-               0x81C, 0x01F60001,
-               0x81C, 0x01F80001,
-               0x81C, 0x01FA0001,
-               0x81C, 0x01FC0001,
-               0x81C, 0x01FE0001,
-       0xFF0F07D8, 0xCDEF,
-               0x81C, 0xFC800001,
-               0x81C, 0xFB820001,
-               0x81C, 0xFA840001,
-               0x81C, 0xF9860001,
-               0x81C, 0xF8880001,
-               0x81C, 0xF78A0001,
-               0x81C, 0xF68C0001,
-               0x81C, 0xF58E0001,
-               0x81C, 0xF4900001,
-               0x81C, 0xF3920001,
-               0x81C, 0xF2940001,
-               0x81C, 0xF1960001,
-               0x81C, 0xF0980001,
-               0x81C, 0xEF9A0001,
-               0x81C, 0xEE9C0001,
-               0x81C, 0xED9E0001,
-               0x81C, 0xECA00001,
-               0x81C, 0xEBA20001,
-               0x81C, 0xEAA40001,
-               0x81C, 0xE9A60001,
-               0x81C, 0xE8A80001,
-               0x81C, 0xE7AA0001,
-               0x81C, 0xE6AC0001,
-               0x81C, 0xE5AE0001,
-               0x81C, 0xE4B00001,
-               0x81C, 0xE3B20001,
-               0x81C, 0xA8B40001,
-               0x81C, 0xA7B60001,
-               0x81C, 0xA6B80001,
-               0x81C, 0xA5BA0001,
-               0x81C, 0xA4BC0001,
-               0x81C, 0xA3BE0001,
-               0x81C, 0xA2C00001,
-               0x81C, 0xA1C20001,
-               0x81C, 0x68C40001,
-               0x81C, 0x67C60001,
-               0x81C, 0x66C80001,
-               0x81C, 0x65CA0001,
-               0x81C, 0x64CC0001,
-               0x81C, 0x47CE0001,
-               0x81C, 0x46D00001,
-               0x81C, 0x45D20001,
-               0x81C, 0x44D40001,
-               0x81C, 0x43D60001,
-               0x81C, 0x42D80001,
-               0x81C, 0x08DA0001,
-               0x81C, 0x07DC0001,
-               0x81C, 0x06DE0001,
-               0x81C, 0x05E00001,
-               0x81C, 0x04E20001,
-               0x81C, 0x03E40001,
-               0x81C, 0x02E60001,
-               0x81C, 0x01E80001,
-               0x81C, 0x01EA0001,
-               0x81C, 0x01EC0001,
-               0x81C, 0x01EE0001,
-               0x81C, 0x01F00001,
-               0x81C, 0x01F20001,
-               0x81C, 0x01F40001,
-               0x81C, 0x01F60001,
-               0x81C, 0x01F80001,
-               0x81C, 0x01FA0001,
-               0x81C, 0x01FC0001,
-               0x81C, 0x01FE0001,
-       0xFF0F07D0, 0xCDEF,
+               0x504, 0x00000028,
+               0x505, 0x000000A3,
+               0x506, 0x0000005E,
+               0x507, 0x00000000,
+               0x508, 0x0000002B,
+               0x509, 0x000000A4,
+               0x50A, 0x0000005E,
+               0x50B, 0x00000000,
+               0x50C, 0x0000004F,
+               0x50D, 0x000000A4,
+               0x50E, 0x00000000,
+               0x50F, 0x00000000,
+               0x512, 0x0000001C,
+               0x514, 0x0000000A,
+               0x516, 0x0000000A,
+               0x525, 0x0000004F,
+               0x550, 0x00000010,
+               0x551, 0x00000010,
+               0x559, 0x00000002,
+               0x55C, 0x00000050,
+               0x55D, 0x000000FF,
+               0x605, 0x00000030,
+               0x607, 0x00000007,
+               0x608, 0x0000000E,
+               0x609, 0x0000002A,
+               0x620, 0x000000FF,
+               0x621, 0x000000FF,
+               0x622, 0x000000FF,
+               0x623, 0x000000FF,
+               0x624, 0x000000FF,
+               0x625, 0x000000FF,
+               0x626, 0x000000FF,
+               0x627, 0x000000FF,
+               0x638, 0x00000050,
+               0x63C, 0x0000000A,
+               0x63D, 0x0000000A,
+               0x63E, 0x0000000E,
+               0x63F, 0x0000000E,
+               0x640, 0x00000040,
+               0x642, 0x00000040,
+               0x643, 0x00000000,
+               0x652, 0x000000C8,
+               0x66E, 0x00000005,
+               0x700, 0x00000021,
+               0x701, 0x00000043,
+               0x702, 0x00000065,
+               0x703, 0x00000087,
+               0x708, 0x00000021,
+               0x709, 0x00000043,
+               0x70A, 0x00000065,
+               0x70B, 0x00000087,
+               0x718, 0x00000040,
+};
+
+u32 RTL8821AE_MAC_1T_ARRAYLEN = sizeof(RTL8821AE_MAC_REG_ARRAY) / sizeof(u32);
+
+u32 RTL8812AE_AGC_TAB_ARRAY[] = {
+       0x80000001, 0x00000000, 0x40000000, 0x00000000,
+               0x81C, 0xFC000001,
+               0x81C, 0xFB020001,
+               0x81C, 0xFA040001,
+               0x81C, 0xF9060001,
+               0x81C, 0xF8080001,
+               0x81C, 0xF70A0001,
+               0x81C, 0xF60C0001,
+               0x81C, 0xF50E0001,
+               0x81C, 0xF4100001,
+               0x81C, 0xF3120001,
+               0x81C, 0xF2140001,
+               0x81C, 0xF1160001,
+               0x81C, 0xF0180001,
+               0x81C, 0xEF1A0001,
+               0x81C, 0xEE1C0001,
+               0x81C, 0xED1E0001,
+               0x81C, 0xEC200001,
+               0x81C, 0xEB220001,
+               0x81C, 0xEA240001,
+               0x81C, 0xCD260001,
+               0x81C, 0xCC280001,
+               0x81C, 0xCB2A0001,
+               0x81C, 0xCA2C0001,
+               0x81C, 0xC92E0001,
+               0x81C, 0xC8300001,
+               0x81C, 0xA6320001,
+               0x81C, 0xA5340001,
+               0x81C, 0xA4360001,
+               0x81C, 0xA3380001,
+               0x81C, 0xA23A0001,
+               0x81C, 0x883C0001,
+               0x81C, 0x873E0001,
+               0x81C, 0x86400001,
+               0x81C, 0x85420001,
+               0x81C, 0x84440001,
+               0x81C, 0x83460001,
+               0x81C, 0x82480001,
+               0x81C, 0x814A0001,
+               0x81C, 0x484C0001,
+               0x81C, 0x474E0001,
+               0x81C, 0x46500001,
+               0x81C, 0x45520001,
+               0x81C, 0x44540001,
+               0x81C, 0x43560001,
+               0x81C, 0x42580001,
+               0x81C, 0x415A0001,
+               0x81C, 0x255C0001,
+               0x81C, 0x245E0001,
+               0x81C, 0x23600001,
+               0x81C, 0x22620001,
+               0x81C, 0x21640001,
+               0x81C, 0x21660001,
+               0x81C, 0x21680001,
+               0x81C, 0x216A0001,
+               0x81C, 0x216C0001,
+               0x81C, 0x216E0001,
+               0x81C, 0x21700001,
+               0x81C, 0x21720001,
+               0x81C, 0x21740001,
+               0x81C, 0x21760001,
+               0x81C, 0x21780001,
+               0x81C, 0x217A0001,
+               0x81C, 0x217C0001,
+               0x81C, 0x217E0001,
+       0x90000001, 0x00000005, 0x40000000, 0x00000000,
+               0x81C, 0xF9000001,
+               0x81C, 0xF8020001,
+               0x81C, 0xF7040001,
+               0x81C, 0xF6060001,
+               0x81C, 0xF5080001,
+               0x81C, 0xF40A0001,
+               0x81C, 0xF30C0001,
+               0x81C, 0xF20E0001,
+               0x81C, 0xF1100001,
+               0x81C, 0xF0120001,
+               0x81C, 0xEF140001,
+               0x81C, 0xEE160001,
+               0x81C, 0xED180001,
+               0x81C, 0xEC1A0001,
+               0x81C, 0xEB1C0001,
+               0x81C, 0xEA1E0001,
+               0x81C, 0xCD200001,
+               0x81C, 0xCC220001,
+               0x81C, 0xCB240001,
+               0x81C, 0xCA260001,
+               0x81C, 0xC9280001,
+               0x81C, 0xC82A0001,
+               0x81C, 0xC72C0001,
+               0x81C, 0xC62E0001,
+               0x81C, 0xA5300001,
+               0x81C, 0xA4320001,
+               0x81C, 0xA3340001,
+               0x81C, 0xA2360001,
+               0x81C, 0x88380001,
+               0x81C, 0x873A0001,
+               0x81C, 0x863C0001,
+               0x81C, 0x853E0001,
+               0x81C, 0x84400001,
+               0x81C, 0x83420001,
+               0x81C, 0x82440001,
+               0x81C, 0x81460001,
+               0x81C, 0x48480001,
+               0x81C, 0x474A0001,
+               0x81C, 0x464C0001,
+               0x81C, 0x454E0001,
+               0x81C, 0x44500001,
+               0x81C, 0x43520001,
+               0x81C, 0x42540001,
+               0x81C, 0x41560001,
+               0x81C, 0x25580001,
+               0x81C, 0x245A0001,
+               0x81C, 0x235C0001,
+               0x81C, 0x225E0001,
+               0x81C, 0x21600001,
+               0x81C, 0x21620001,
+               0x81C, 0x21640001,
+               0x81C, 0x21660001,
+               0x81C, 0x21680001,
+               0x81C, 0x216A0001,
+               0x81C, 0x236C0001,
+               0x81C, 0x226E0001,
+               0x81C, 0x21700001,
+               0x81C, 0x21720001,
+               0x81C, 0x21740001,
+               0x81C, 0x21760001,
+               0x81C, 0x21780001,
+               0x81C, 0x217A0001,
+               0x81C, 0x217C0001,
+               0x81C, 0x217E0001,
+       0xA0000000, 0x00000000,
+               0x81C, 0xFF000001,
+               0x81C, 0xFF020001,
+               0x81C, 0xFF040001,
+               0x81C, 0xFF060001,
+               0x81C, 0xFF080001,
+               0x81C, 0xFE0A0001,
+               0x81C, 0xFD0C0001,
+               0x81C, 0xFC0E0001,
+               0x81C, 0xFB100001,
+               0x81C, 0xFA120001,
+               0x81C, 0xF9140001,
+               0x81C, 0xF8160001,
+               0x81C, 0xF7180001,
+               0x81C, 0xF61A0001,
+               0x81C, 0xF51C0001,
+               0x81C, 0xF41E0001,
+               0x81C, 0xF3200001,
+               0x81C, 0xF2220001,
+               0x81C, 0xF1240001,
+               0x81C, 0xF0260001,
+               0x81C, 0xEF280001,
+               0x81C, 0xEE2A0001,
+               0x81C, 0xED2C0001,
+               0x81C, 0xEC2E0001,
+               0x81C, 0xEB300001,
+               0x81C, 0xEA320001,
+               0x81C, 0xE9340001,
+               0x81C, 0xE8360001,
+               0x81C, 0xE7380001,
+               0x81C, 0xE63A0001,
+               0x81C, 0xE53C0001,
+               0x81C, 0xC73E0001,
+               0x81C, 0xC6400001,
+               0x81C, 0xC5420001,
+               0x81C, 0xC4440001,
+               0x81C, 0xC3460001,
+               0x81C, 0xC2480001,
+               0x81C, 0xC14A0001,
+               0x81C, 0xA74C0001,
+               0x81C, 0xA64E0001,
+               0x81C, 0xA5500001,
+               0x81C, 0xA4520001,
+               0x81C, 0xA3540001,
+               0x81C, 0xA2560001,
+               0x81C, 0xA1580001,
+               0x81C, 0x675A0001,
+               0x81C, 0x665C0001,
+               0x81C, 0x655E0001,
+               0x81C, 0x64600001,
+               0x81C, 0x63620001,
+               0x81C, 0x48640001,
+               0x81C, 0x47660001,
+               0x81C, 0x46680001,
+               0x81C, 0x456A0001,
+               0x81C, 0x446C0001,
+               0x81C, 0x436E0001,
+               0x81C, 0x42700001,
+               0x81C, 0x41720001,
+               0x81C, 0x41740001,
+               0x81C, 0x41760001,
+               0x81C, 0x41780001,
+               0x81C, 0x417A0001,
+               0x81C, 0x417C0001,
+               0x81C, 0x417E0001,
+       0xB0000000, 0x00000000,
+       0x80000004, 0x00000000, 0x40000000, 0x00000000,
                0x81C, 0xFC800001,
                0x81C, 0xFB820001,
                0x81C, 0xFA840001,
@@ -3176,7 +2407,7 @@ u32 RTL8812AE_AGC_TAB_ARRAY[] = {
                0x81C, 0x01FA0001,
                0x81C, 0x01FC0001,
                0x81C, 0x01FE0001,
-       0xCDCDCDCD, 0xCDCD,
+       0xA0000000, 0x00000000,
                0x81C, 0xFF800001,
                0x81C, 0xFF820001,
                0x81C, 0xFF840001,
@@ -3241,14 +2472,16 @@ u32 RTL8812AE_AGC_TAB_ARRAY[] = {
                0x81C, 0x01FA0001,
                0x81C, 0x01FC0001,
                0x81C, 0x01FE0001,
-       0xFF0F0180, 0xDEAD,
+       0xB0000000, 0x00000000,
                0xC50, 0x00000022,
                0xC50, 0x00000020,
                0xE50, 0x00000022,
                0xE50, 0x00000020,
-
 };
 
+u32 RTL8812AE_AGC_TAB_1TARRAYLEN =
+       sizeof(RTL8812AE_AGC_TAB_ARRAY) / sizeof(u32);
+
 u32 RTL8821AE_AGC_TAB_ARRAY[] = {
                0x81C, 0xBF000001,
                0x81C, 0xBF020001,
@@ -3730,9 +2963,9 @@ u8 *RTL8812AE_TXPWR_LMT[] = {
        "FCC", "5G", "20M", "OFDM", "1T", "100", "30",
        "ETSI", "5G", "20M", "OFDM", "1T", "100", "32",
        "MKK", "5G", "20M", "OFDM", "1T", "100", "32",
-       "FCC", "5G", "20M", "OFDM", "1T", "114", "30",
-       "ETSI", "5G", "20M", "OFDM", "1T", "114", "32",
-       "MKK", "5G", "20M", "OFDM", "1T", "114", "32",
+       "FCC", "5G", "20M", "OFDM", "1T", "104", "30",
+       "ETSI", "5G", "20M", "OFDM", "1T", "104", "32",
+       "MKK", "5G", "20M", "OFDM", "1T", "104", "32",
        "FCC", "5G", "20M", "OFDM", "1T", "108", "32",
        "ETSI", "5G", "20M", "OFDM", "1T", "108", "32",
        "MKK", "5G", "20M", "OFDM", "1T", "108", "32",
@@ -3802,9 +3035,9 @@ u8 *RTL8812AE_TXPWR_LMT[] = {
        "FCC", "5G", "20M", "HT", "1T", "100", "30",
        "ETSI", "5G", "20M", "HT", "1T", "100", "32",
        "MKK", "5G", "20M", "HT", "1T", "100", "32",
-       "FCC", "5G", "20M", "HT", "1T", "114", "30",
-       "ETSI", "5G", "20M", "HT", "1T", "114", "32",
-       "MKK", "5G", "20M", "HT", "1T", "114", "32",
+       "FCC", "5G", "20M", "HT", "1T", "104", "30",
+       "ETSI", "5G", "20M", "HT", "1T", "104", "32",
+       "MKK", "5G", "20M", "HT", "1T", "104", "32",
        "FCC", "5G", "20M", "HT", "1T", "108", "32",
        "ETSI", "5G", "20M", "HT", "1T", "108", "32",
        "MKK", "5G", "20M", "HT", "1T", "108", "32",
@@ -3874,9 +3107,9 @@ u8 *RTL8812AE_TXPWR_LMT[] = {
        "FCC", "5G", "20M", "HT", "2T", "100", "28",
        "ETSI", "5G", "20M", "HT", "2T", "100", "30",
        "MKK", "5G", "20M", "HT", "2T", "100", "30",
-       "FCC", "5G", "20M", "HT", "2T", "114", "28",
-       "ETSI", "5G", "20M", "HT", "2T", "114", "30",
-       "MKK", "5G", "20M", "HT", "2T", "114", "30",
+       "FCC", "5G", "20M", "HT", "2T", "104", "28",
+       "ETSI", "5G", "20M", "HT", "2T", "104", "30",
+       "MKK", "5G", "20M", "HT", "2T", "104", "30",
        "FCC", "5G", "20M", "HT", "2T", "108", "30",
        "ETSI", "5G", "20M", "HT", "2T", "108", "30",
        "MKK", "5G", "20M", "HT", "2T", "108", "30",
@@ -4017,6 +3250,8 @@ u8 *RTL8812AE_TXPWR_LMT[] = {
        "MKK", "5G", "80M", "VHT", "2T", "155", "63"
 };
 
+u32 RTL8812AE_TXPWR_LMT_ARRAY_LEN = sizeof(RTL8812AE_TXPWR_LMT) / sizeof(u8 *);
+
 u8 *RTL8821AE_TXPWR_LMT[] = {
        "FCC", "2.4G", "20M", "CCK", "1T", "01", "32",
        "ETSI", "2.4G", "20M", "CCK", "1T", "01", "32",

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h
index 192057a..36c2388 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h
@@ -31,28 +31,27 @@
 #include <linux/types.h>
 extern u32 RTL8821AE_PHY_REG_1TARRAYLEN;
 extern u32 RTL8821AE_PHY_REG_ARRAY[];
-#define  RTL8812AEPHY_REG_1TARRAYLEN   490
+extern u32 RTL8812AE_PHY_REG_1TARRAYLEN;
 extern u32 RTL8812AE_PHY_REG_ARRAY[];
 extern u32 RTL8821AE_PHY_REG_ARRAY_PGLEN;
 extern u32 RTL8821AE_PHY_REG_ARRAY_PG[];
-#define RTL8812AEPHY_REG_ARRAY_PGLEN   276
+extern u32 RTL8812AE_PHY_REG_ARRAY_PGLEN;
 extern u32 RTL8812AE_PHY_REG_ARRAY_PG[];
-/* #define     RTL8723BE_RADIOA_1TARRAYLEN     206 */
-#define        RTL8812AE_RADIOA_1TARRAYLEN     1264
+extern u32 RTL8812AE_RADIOA_1TARRAYLEN;
 extern u32 RTL8812AE_RADIOA_ARRAY[];
-#define        RTL8812AE_RADIOB_1TARRAYLEN     1240
+extern u32 RTL8812AE_RADIOB_1TARRAYLEN;
 extern u32 RTL8812AE_RADIOB_ARRAY[];
 extern u32 RTL8821AE_RADIOA_1TARRAYLEN;
 extern u32 RTL8821AE_RADIOA_ARRAY[];
 extern u32 RTL8821AE_MAC_1T_ARRAYLEN;
 extern u32 RTL8821AE_MAC_REG_ARRAY[];
-#define RTL8812AEMAC_1T_ARRAYLEN               214
+extern u32 RTL8812AE_MAC_1T_ARRAYLEN;
 extern u32 RTL8812AE_MAC_REG_ARRAY[];
 extern u32 RTL8821AE_AGC_TAB_1TARRAYLEN;
 extern u32 RTL8821AE_AGC_TAB_ARRAY[];
-#define RTL8812AEAGCTAB_1TARRAYLEN             1312
+extern u32 RTL8812AE_AGC_TAB_1TARRAYLEN;
 extern u32 RTL8812AE_AGC_TAB_ARRAY[];
-#define RTL8812AE_TXPWR_LMT_ARRAY_LEN          3948
+extern u32 RTL8812AE_TXPWR_LMT_ARRAY_LEN;
 extern u8 *RTL8812AE_TXPWR_LMT[];
 extern u32 RTL8821AE_TXPWR_LMT_ARRAY_LEN;
 extern u8 *RTL8821AE_TXPWR_LMT[];