staging: brcm80211: use identifiers instead of string for srom lookup
[pandora-kernel.git] / drivers / staging / brcm80211 / brcmsmac / phy / phy_n.c
index a4417e9..cd19c2f 100644 (file)
@@ -14388,25 +14388,25 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)
        if (pi->sh->sromrev >= 9)
                return;
 
-       bw40po = (u16) wlapi_getintvar(shim, "bw40po");
+       bw40po = (u16) wlapi_getintvar(shim, BRCMS_SROM_BW40PO);
        pi->bw402gpo = bw40po & 0xf;
        pi->bw405gpo = (bw40po & 0xf0) >> 4;
        pi->bw405glpo = (bw40po & 0xf00) >> 8;
        pi->bw405ghpo = (bw40po & 0xf000) >> 12;
 
-       cddpo = (u16) wlapi_getintvar(shim, "cddpo");
+       cddpo = (u16) wlapi_getintvar(shim, BRCMS_SROM_CDDPO);
        pi->cdd2gpo = cddpo & 0xf;
        pi->cdd5gpo = (cddpo & 0xf0) >> 4;
        pi->cdd5glpo = (cddpo & 0xf00) >> 8;
        pi->cdd5ghpo = (cddpo & 0xf000) >> 12;
 
-       stbcpo = (u16) wlapi_getintvar(shim, "stbcpo");
+       stbcpo = (u16) wlapi_getintvar(shim, BRCMS_SROM_STBCPO);
        pi->stbc2gpo = stbcpo & 0xf;
        pi->stbc5gpo = (stbcpo & 0xf0) >> 4;
        pi->stbc5glpo = (stbcpo & 0xf00) >> 8;
        pi->stbc5ghpo = (stbcpo & 0xf000) >> 12;
 
-       bwduppo = (u16) wlapi_getintvar(shim, "bwduppo");
+       bwduppo = (u16) wlapi_getintvar(shim, BRCMS_SROM_BWDUPPO);
        pi->bwdup2gpo = bwduppo & 0xf;
        pi->bwdup5gpo = (bwduppo & 0xf0) >> 4;
        pi->bwdup5glpo = (bwduppo & 0xf00) >> 8;
@@ -14418,186 +14418,264 @@ static void wlc_phy_txpwr_srom_read_ppr_nphy(struct brcms_phy *pi)
                case 0:
 
                        pi->nphy_txpid2g[PHY_CORE_0] =
-                               (u8) wlapi_getintvar(shim, "txpid2ga0");
+                               (u8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_TXPID2GA0);
                        pi->nphy_txpid2g[PHY_CORE_1] =
-                               (u8) wlapi_getintvar(shim, "txpid2ga1");
+                               (u8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_TXPID2GA1);
                        pi->nphy_pwrctrl_info[PHY_CORE_0].max_pwr_2g =
-                               (s8) wlapi_getintvar(shim, "maxp2ga0");
+                               (s8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_MAXP2GA0);
                        pi->nphy_pwrctrl_info[PHY_CORE_1].max_pwr_2g =
-                               (s8) wlapi_getintvar(shim, "maxp2ga1");
+                               (s8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_MAXP2GA1);
                        pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_2g_a1 =
-                               (s16) wlapi_getintvar(shim, "pa2gw0a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA2GW0A0);
                        pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_2g_a1 =
-                               (s16) wlapi_getintvar(shim, "pa2gw0a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA2GW0A1);
                        pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_2g_b0 =
-                               (s16) wlapi_getintvar(shim, "pa2gw1a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA2GW1A0);
                        pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_2g_b0 =
-                               (s16) wlapi_getintvar(shim, "pa2gw1a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA2GW1A1);
                        pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_2g_b1 =
-                               (s16) wlapi_getintvar(shim, "pa2gw2a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA2GW2A0);
                        pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_2g_b1 =
-                               (s16) wlapi_getintvar(shim, "pa2gw2a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA2GW2A1);
                        pi->nphy_pwrctrl_info[PHY_CORE_0].idle_targ_2g =
-                               (s8) wlapi_getintvar(shim, "itt2ga0");
+                               (s8) wlapi_getintvar(shim, BRCMS_SROM_ITT2GA0);
                        pi->nphy_pwrctrl_info[PHY_CORE_1].idle_targ_2g =
-                               (s8) wlapi_getintvar(shim, "itt2ga1");
+                               (s8) wlapi_getintvar(shim, BRCMS_SROM_ITT2GA1);
 
-                       pi->cck2gpo = (u16) wlapi_getintvar(shim, "cck2gpo");
+                       pi->cck2gpo = (u16) wlapi_getintvar(shim,
+                                                           BRCMS_SROM_CCK2GPO);
 
-                       pi->ofdm2gpo = (u32) wlapi_getintvar(shim, "ofdm2gpo");
+                       pi->ofdm2gpo =
+                               (u32) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_OFDM2GPO);
 
                        pi->mcs2gpo[0] =
-                               (u16) wlapi_getintvar(shim, "mcs2gpo0");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS2GPO0);
                        pi->mcs2gpo[1] =
-                               (u16) wlapi_getintvar(shim, "mcs2gpo1");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS2GPO1);
                        pi->mcs2gpo[2] =
-                               (u16) wlapi_getintvar(shim, "mcs2gpo2");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS2GPO2);
                        pi->mcs2gpo[3] =
-                               (u16) wlapi_getintvar(shim, "mcs2gpo3");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS2GPO3);
                        pi->mcs2gpo[4] =
-                               (u16) wlapi_getintvar(shim, "mcs2gpo4");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS2GPO4);
                        pi->mcs2gpo[5] =
-                               (u16) wlapi_getintvar(shim, "mcs2gpo5");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS2GPO5);
                        pi->mcs2gpo[6] =
-                               (u16) wlapi_getintvar(shim, "mcs2gpo6");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS2GPO6);
                        pi->mcs2gpo[7] =
-                               (u16) wlapi_getintvar(shim, "mcs2gpo7");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS2GPO7);
                        break;
                case 1:
 
                        pi->nphy_txpid5g[PHY_CORE_0] =
-                               (u8) wlapi_getintvar(shim, "txpid5ga0");
+                               (u8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_TXPID5GA0);
                        pi->nphy_txpid5g[PHY_CORE_1] =
-                               (u8) wlapi_getintvar(shim, "txpid5ga1");
+                               (u8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_TXPID5GA1);
                        pi->nphy_pwrctrl_info[PHY_CORE_0].max_pwr_5gm =
-                               (s8) wlapi_getintvar(shim, "maxp5ga0");
+                               (s8) wlapi_getintvar(shim, BRCMS_SROM_MAXP5GA0);
                        pi->nphy_pwrctrl_info[PHY_CORE_1].max_pwr_5gm =
-                               (s8) wlapi_getintvar(shim, "maxp5ga1");
+                               (s8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_MAXP5GA1);
                        pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_5gm_a1 =
-                               (s16) wlapi_getintvar(shim, "pa5gw0a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GW0A0);
                        pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_5gm_a1 =
-                               (s16) wlapi_getintvar(shim, "pa5gw0a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GW0A1);
                        pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_5gm_b0 =
-                               (s16) wlapi_getintvar(shim, "pa5gw1a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GW1A0);
                        pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_5gm_b0 =
-                               (s16) wlapi_getintvar(shim, "pa5gw1a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GW1A1);
                        pi->nphy_pwrctrl_info[PHY_CORE_0].pwrdet_5gm_b1 =
-                               (s16) wlapi_getintvar(shim, "pa5gw2a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GW2A0);
                        pi->nphy_pwrctrl_info[PHY_CORE_1].pwrdet_5gm_b1 =
-                               (s16) wlapi_getintvar(shim, "pa5gw2a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GW2A1);
                        pi->nphy_pwrctrl_info[PHY_CORE_0].idle_targ_5gm =
-                               (s8) wlapi_getintvar(shim, "itt5ga0");
+                               (s8) wlapi_getintvar(shim, BRCMS_SROM_ITT5GA0);
                        pi->nphy_pwrctrl_info[PHY_CORE_1].idle_targ_5gm =
-                               (s8) wlapi_getintvar(shim, "itt5ga1");
+                               (s8) wlapi_getintvar(shim, BRCMS_SROM_ITT5GA1);
 
-                       pi->ofdm5gpo = (u32) wlapi_getintvar(shim, "ofdm5gpo");
+                       pi->ofdm5gpo =
+                               (u32) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_OFDM5GPO);
 
                        pi->mcs5gpo[0] =
-                               (u16) wlapi_getintvar(shim, "mcs5gpo0");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GPO0);
                        pi->mcs5gpo[1] =
-                               (u16) wlapi_getintvar(shim, "mcs5gpo1");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GPO1);
                        pi->mcs5gpo[2] =
-                               (u16) wlapi_getintvar(shim, "mcs5gpo2");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GPO2);
                        pi->mcs5gpo[3] =
-                               (u16) wlapi_getintvar(shim, "mcs5gpo3");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GPO3);
                        pi->mcs5gpo[4] =
-                               (u16) wlapi_getintvar(shim, "mcs5gpo4");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GPO4);
                        pi->mcs5gpo[5] =
-                               (u16) wlapi_getintvar(shim, "mcs5gpo5");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GPO5);
                        pi->mcs5gpo[6] =
-                               (u16) wlapi_getintvar(shim, "mcs5gpo6");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GPO6);
                        pi->mcs5gpo[7] =
-                               (u16) wlapi_getintvar(shim, "mcs5gpo7");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GPO7);
                        break;
                case 2:
 
                        pi->nphy_txpid5gl[0] =
-                               (u8) wlapi_getintvar(shim, "txpid5gla0");
+                               (u8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_TXPID5GLA0);
                        pi->nphy_txpid5gl[1] =
-                               (u8) wlapi_getintvar(shim, "txpid5gla1");
+                               (u8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_TXPID5GLA1);
                        pi->nphy_pwrctrl_info[0].max_pwr_5gl =
-                               (s8) wlapi_getintvar(shim, "maxp5gla0");
+                               (s8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_MAXP5GLA0);
                        pi->nphy_pwrctrl_info[1].max_pwr_5gl =
-                               (s8) wlapi_getintvar(shim, "maxp5gla1");
+                               (s8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_MAXP5GLA1);
                        pi->nphy_pwrctrl_info[0].pwrdet_5gl_a1 =
-                               (s16) wlapi_getintvar(shim, "pa5glw0a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GLW0A0);
                        pi->nphy_pwrctrl_info[1].pwrdet_5gl_a1 =
-                               (s16) wlapi_getintvar(shim, "pa5glw0a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GLW0A1);
                        pi->nphy_pwrctrl_info[0].pwrdet_5gl_b0 =
-                               (s16) wlapi_getintvar(shim, "pa5glw1a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GLW1A0);
                        pi->nphy_pwrctrl_info[1].pwrdet_5gl_b0 =
-                               (s16) wlapi_getintvar(shim, "pa5glw1a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GLW1A1);
                        pi->nphy_pwrctrl_info[0].pwrdet_5gl_b1 =
-                               (s16) wlapi_getintvar(shim, "pa5glw2a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GLW2A0);
                        pi->nphy_pwrctrl_info[1].pwrdet_5gl_b1 =
-                               (s16) wlapi_getintvar(shim, "pa5glw2a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GLW2A1);
                        pi->nphy_pwrctrl_info[0].idle_targ_5gl = 0;
                        pi->nphy_pwrctrl_info[1].idle_targ_5gl = 0;
 
                        pi->ofdm5glpo =
-                               (u32) wlapi_getintvar(shim, "ofdm5glpo");
+                               (u32) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_OFDM5GLPO);
 
                        pi->mcs5glpo[0] =
-                               (u16) wlapi_getintvar(shim, "mcs5glpo0");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GLPO0);
                        pi->mcs5glpo[1] =
-                               (u16) wlapi_getintvar(shim, "mcs5glpo1");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GLPO1);
                        pi->mcs5glpo[2] =
-                               (u16) wlapi_getintvar(shim, "mcs5glpo2");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GLPO2);
                        pi->mcs5glpo[3] =
-                               (u16) wlapi_getintvar(shim, "mcs5glpo3");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GLPO3);
                        pi->mcs5glpo[4] =
-                               (u16) wlapi_getintvar(shim, "mcs5glpo4");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GLPO4);
                        pi->mcs5glpo[5] =
-                               (u16) wlapi_getintvar(shim, "mcs5glpo5");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GLPO5);
                        pi->mcs5glpo[6] =
-                               (u16) wlapi_getintvar(shim, "mcs5glpo6");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GLPO6);
                        pi->mcs5glpo[7] =
-                               (u16) wlapi_getintvar(shim, "mcs5glpo7");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GLPO7);
                        break;
                case 3:
 
                        pi->nphy_txpid5gh[0] =
-                               (u8) wlapi_getintvar(shim, "txpid5gha0");
+                               (u8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_TXPID5GHA0);
                        pi->nphy_txpid5gh[1] =
-                               (u8) wlapi_getintvar(shim, "txpid5gha1");
+                               (u8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_TXPID5GHA1);
                        pi->nphy_pwrctrl_info[0].max_pwr_5gh =
-                               (s8) wlapi_getintvar(shim, "maxp5gha0");
+                               (s8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_MAXP5GHA0);
                        pi->nphy_pwrctrl_info[1].max_pwr_5gh =
-                               (s8) wlapi_getintvar(shim, "maxp5gha1");
+                               (s8) wlapi_getintvar(shim,
+                                                    BRCMS_SROM_MAXP5GHA1);
                        pi->nphy_pwrctrl_info[0].pwrdet_5gh_a1 =
-                               (s16) wlapi_getintvar(shim, "pa5ghw0a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GHW0A0);
                        pi->nphy_pwrctrl_info[1].pwrdet_5gh_a1 =
-                               (s16) wlapi_getintvar(shim, "pa5ghw0a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GHW0A1);
                        pi->nphy_pwrctrl_info[0].pwrdet_5gh_b0 =
-                               (s16) wlapi_getintvar(shim, "pa5ghw1a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GHW1A0);
                        pi->nphy_pwrctrl_info[1].pwrdet_5gh_b0 =
-                               (s16) wlapi_getintvar(shim, "pa5ghw1a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GHW1A1);
                        pi->nphy_pwrctrl_info[0].pwrdet_5gh_b1 =
-                               (s16) wlapi_getintvar(shim, "pa5ghw2a0");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GHW2A0);
                        pi->nphy_pwrctrl_info[1].pwrdet_5gh_b1 =
-                               (s16) wlapi_getintvar(shim, "pa5ghw2a1");
+                               (s16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_PA5GHW2A1);
                        pi->nphy_pwrctrl_info[0].idle_targ_5gh = 0;
                        pi->nphy_pwrctrl_info[1].idle_targ_5gh = 0;
 
                        pi->ofdm5ghpo =
-                               (u32) wlapi_getintvar(shim, "ofdm5ghpo");
+                               (u32) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_OFDM5GHPO);
 
                        pi->mcs5ghpo[0] =
-                               (u16) wlapi_getintvar(shim, "mcs5ghpo0");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GHPO0);
                        pi->mcs5ghpo[1] =
-                               (u16) wlapi_getintvar(shim, "mcs5ghpo1");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GHPO1);
                        pi->mcs5ghpo[2] =
-                               (u16) wlapi_getintvar(shim, "mcs5ghpo2");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GHPO2);
                        pi->mcs5ghpo[3] =
-                               (u16) wlapi_getintvar(shim, "mcs5ghpo3");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GHPO3);
                        pi->mcs5ghpo[4] =
-                               (u16) wlapi_getintvar(shim, "mcs5ghpo4");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GHPO4);
                        pi->mcs5ghpo[5] =
-                               (u16) wlapi_getintvar(shim, "mcs5ghpo5");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GHPO5);
                        pi->mcs5ghpo[6] =
-                               (u16) wlapi_getintvar(shim, "mcs5ghpo6");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GHPO6);
                        pi->mcs5ghpo[7] =
-                               (u16) wlapi_getintvar(shim, "mcs5ghpo7");
+                               (u16) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_MCS5GHPO7);
                        break;
                }
        }
@@ -14609,35 +14687,43 @@ static bool wlc_phy_txpwr_srom_read_nphy(struct brcms_phy *pi)
 {
        struct phy_shim_info *shim = pi->sh->physhim;
 
-       pi->antswitch = (u8) wlapi_getintvar(shim, "antswitch");
-       pi->aa2g = (u8) wlapi_getintvar(shim, "aa2g");
-       pi->aa5g = (u8) wlapi_getintvar(shim, "aa5g");
-
-       pi->srom_fem2g.tssipos = (u8) wlapi_getintvar(shim, "tssipos2g");
-       pi->srom_fem2g.extpagain = (u8) wlapi_getintvar(shim, "extpagain2g");
-       pi->srom_fem2g.pdetrange = (u8) wlapi_getintvar(shim, "pdetrange2g");
-       pi->srom_fem2g.triso = (u8) wlapi_getintvar(shim, "triso2g");
-       pi->srom_fem2g.antswctrllut = (u8) wlapi_getintvar(shim, "antswctl2g");
-
-       pi->srom_fem5g.tssipos = (u8) wlapi_getintvar(shim, "tssipos5g");
-       pi->srom_fem5g.extpagain = (u8) wlapi_getintvar(shim, "extpagain5g");
-       pi->srom_fem5g.pdetrange = (u8) wlapi_getintvar(shim, "pdetrange5g");
-       pi->srom_fem5g.triso = (u8) wlapi_getintvar(shim, "triso5g");
-       if (wlapi_getvar(shim, "antswctl5g"))
+       pi->antswitch = (u8) wlapi_getintvar(shim, BRCMS_SROM_ANTSWITCH);
+       pi->aa2g = (u8) wlapi_getintvar(shim, BRCMS_SROM_AA2G);
+       pi->aa5g = (u8) wlapi_getintvar(shim, BRCMS_SROM_AA5G);
+
+       pi->srom_fem2g.tssipos = (u8) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_TSSIPOS2G);
+       pi->srom_fem2g.extpagain = (u8) wlapi_getintvar(shim,
+                                                       BRCMS_SROM_EXTPAGAIN2G);
+       pi->srom_fem2g.pdetrange = (u8) wlapi_getintvar(shim,
+                                                       BRCMS_SROM_PDETRANGE2G);
+       pi->srom_fem2g.triso = (u8) wlapi_getintvar(shim, BRCMS_SROM_TRISO2G);
+       pi->srom_fem2g.antswctrllut =
+                       (u8) wlapi_getintvar(shim, BRCMS_SROM_ANTSWCTL2G);
+
+       pi->srom_fem5g.tssipos = (u8) wlapi_getintvar(shim,
+                                                     BRCMS_SROM_TSSIPOS5G);
+       pi->srom_fem5g.extpagain = (u8) wlapi_getintvar(shim,
+                                                       BRCMS_SROM_EXTPAGAIN5G);
+       pi->srom_fem5g.pdetrange = (u8) wlapi_getintvar(shim,
+                                                       BRCMS_SROM_PDETRANGE5G);
+       pi->srom_fem5g.triso = (u8) wlapi_getintvar(shim, BRCMS_SROM_TRISO5G);
+       if (wlapi_getvar(shim, BRCMS_SROM_ANTSWCTL5G))
                pi->srom_fem5g.antswctrllut =
-                       (u8) wlapi_getintvar(shim, "antswctl5g");
+                       (u8) wlapi_getintvar(shim, BRCMS_SROM_ANTSWCTL5G);
        else
                pi->srom_fem5g.antswctrllut =
-                       (u8) wlapi_getintvar(shim, "antswctl2g");
+                       (u8) wlapi_getintvar(shim, BRCMS_SROM_ANTSWCTL2G);
 
        wlc_phy_txpower_ipa_upd(pi);
 
        pi->phy_txcore_disable_temp =
-                       (s16) wlapi_getintvar(shim, "tempthresh");
+                       (s16) wlapi_getintvar(shim, BRCMS_SROM_TEMPTHRESH);
        if (pi->phy_txcore_disable_temp == 0)
                pi->phy_txcore_disable_temp = PHY_CHAIN_TX_DISABLE_TEMP;
 
-       pi->phy_tempsense_offset = (s8) wlapi_getintvar(shim, "tempoffset");
+       pi->phy_tempsense_offset = (s8) wlapi_getintvar(shim,
+                                                       BRCMS_SROM_TEMPOFFSET);
        if (pi->phy_tempsense_offset != 0) {
                if (pi->phy_tempsense_offset >
                    (NPHY_SROM_TEMPSHIFT + NPHY_SROM_MAXTEMPOFFSET))
@@ -14653,7 +14739,7 @@ static bool wlc_phy_txpwr_srom_read_nphy(struct brcms_phy *pi)
                pi->phy_txcore_disable_temp - PHY_HYSTERESIS_DELTATEMP;
 
        pi->phycal_tempdelta =
-                       (u8) wlapi_getintvar(shim, "phycal_tempdelta");
+                       (u8) wlapi_getintvar(shim, BRCMS_SROM_PHYCAL_TEMPDELTA);
        if (pi->phycal_tempdelta > NPHY_CAL_MAXTEMPDELTA)
                pi->phycal_tempdelta = 0;