Skip to content

L
linux
Commit 8d30b708 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files
Options

brcm80211: smac: use bcma core access functions in pmu.c 

The code in pmu.c now uses the functions provided by BCMA to
access the core registers.
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b14f1674
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 80 deletions
drivers/net/wireless/brcm80211/brcmsmac/pmu.c
View file @ 8d30b708
...@@ -140,7 +140,7 @@ static void si_pmu_res_masks(struct si_pub *sih, u32 * pmin, u32 * pmax) ...@@ -140,7 +140,7 @@ static void si_pmu_res_masks(struct si_pub *sih, u32 * pmin, u32 * pmax)
} }
static void static void
si_pmu_spuravoid_pllupdate(struct si_pub *sih, struct chipcregs __iomem *cc, si_pmu_spuravoid_pllupdate(struct si_pub *sih, struct bcma_device *core,
u8 spuravoid) u8 spuravoid)
{ {
u32 tmp = 0; u32 tmp = 0;
...@@ -149,58 +149,65 @@ si_pmu_spuravoid_pllupdate(struct si_pub *sih, struct chipcregs __iomem *cc, ...@@ -149,58 +149,65 @@ si_pmu_spuravoid_pllupdate(struct si_pub *sih, struct chipcregs __iomem *cc,
case BCM43224_CHIP_ID: case BCM43224_CHIP_ID:
case BCM43225_CHIP_ID: case BCM43225_CHIP_ID:
if (spuravoid == 1) { if (spuravoid == 1) {
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL0); bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
W_REG(&cc->pllcontrol_data, 0x11500010); PMU1_PLL0_PLLCTL0);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL1); bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
W_REG(&cc->pllcontrol_data, 0x000C0C06); 0x11500010);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL2); bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
W_REG(&cc->pllcontrol_data, 0x0F600a08); PMU1_PLL0_PLLCTL1);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL3); bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
W_REG(&cc->pllcontrol_data, 0x00000000); 0x000C0C06);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL4); bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
W_REG(&cc->pllcontrol_data, 0x2001E920); PMU1_PLL0_PLLCTL2);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL5); bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
W_REG(&cc->pllcontrol_data, 0x88888815); 0x0F600a08);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
PMU1_PLL0_PLLCTL3);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
0x00000000);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
PMU1_PLL0_PLLCTL4);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
0x2001E920);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
PMU1_PLL0_PLLCTL5);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
0x88888815);
} else { } else {
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL0); bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
W_REG(&cc->pllcontrol_data, 0x11100010); PMU1_PLL0_PLLCTL0);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL1); bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
W_REG(&cc->pllcontrol_data, 0x000c0c06); 0x11100010);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL2); bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
W_REG(&cc->pllcontrol_data, 0x03000a08); PMU1_PLL0_PLLCTL1);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL3); bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
W_REG(&cc->pllcontrol_data, 0x00000000); 0x000c0c06);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL4); bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
W_REG(&cc->pllcontrol_data, 0x200005c0); PMU1_PLL0_PLLCTL2);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL5); bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
W_REG(&cc->pllcontrol_data, 0x88888815); 0x03000a08);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
PMU1_PLL0_PLLCTL3);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
0x00000000);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
PMU1_PLL0_PLLCTL4);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
0x200005c0);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_addr),
PMU1_PLL0_PLLCTL5);
bcma_write32(core, CHIPCREGOFFS(pllcontrol_data),
0x88888815);
} }
tmp = 1 << 10; tmp = 1 << 10;
break; break;
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL0);
W_REG(&cc->pllcontrol_data, 0x11100008);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL1);
W_REG(&cc->pllcontrol_data, 0x0c000c06);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL2);
W_REG(&cc->pllcontrol_data, 0x03000a08);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL3);
W_REG(&cc->pllcontrol_data, 0x00000000);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL4);
W_REG(&cc->pllcontrol_data, 0x200005c0);
W_REG(&cc->pllcontrol_addr, PMU1_PLL0_PLLCTL5);
W_REG(&cc->pllcontrol_data, 0x88888855);
tmp = 1 << 10;
break;
default: default:
/* bail out */ /* bail out */
return; return;
} }
tmp |= R_REG(&cc->pmucontrol); bcma_set32(core, CHIPCREGOFFS(pmucontrol), tmp);
W_REG(&cc->pmucontrol, tmp);
} }
u16 si_pmu_fast_pwrup_delay(struct si_pub *sih) u16 si_pmu_fast_pwrup_delay(struct si_pub *sih)
...@@ -289,11 +296,11 @@ u32 si_pmu_alp_clock(struct si_pub *sih) ...@@ -289,11 +296,11 @@ u32 si_pmu_alp_clock(struct si_pub *sih)
void si_pmu_spuravoid(struct si_pub *sih, u8 spuravoid) void si_pmu_spuravoid(struct si_pub *sih, u8 spuravoid)
{ {
struct chipcregs __iomem *cc; struct bcma_device *cc;
uint origidx, intr_val; uint origidx, intr_val;
/* Remember original core before switch to chipc */ /* switch to chipc */
cc = (struct chipcregs __iomem *) cc = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
ai_switch_core(sih, CC_CORE_ID, &origidx, &intr_val); ai_switch_core(sih, CC_CORE_ID, &origidx, &intr_val);
/* update the pll changes */ /* update the pll changes */
...@@ -306,20 +313,16 @@ void si_pmu_spuravoid(struct si_pub *sih, u8 spuravoid) ...@@ -306,20 +313,16 @@ void si_pmu_spuravoid(struct si_pub *sih, u8 spuravoid)
/* initialize PMU */ /* initialize PMU */
void si_pmu_init(struct si_pub *sih) void si_pmu_init(struct si_pub *sih)
{ {
struct chipcregs __iomem *cc; struct bcma_device *core;
uint origidx;
/* Remember original core before switch to chipc */ /* select chipc */
origidx = ai_coreidx(sih); core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
cc = ai_setcoreidx(sih, SI_CC_IDX);
if (ai_get_pmurev(sih) == 1) if (ai_get_pmurev(sih) == 1)
AND_REG(&cc->pmucontrol, ~PCTL_NOILP_ON_WAIT); bcma_mask32(core, CHIPCREGOFFS(pmucontrol),
~PCTL_NOILP_ON_WAIT);
else if (ai_get_pmurev(sih) >= 2) else if (ai_get_pmurev(sih) >= 2)
OR_REG(&cc->pmucontrol, PCTL_NOILP_ON_WAIT); bcma_set32(core, CHIPCREGOFFS(pmucontrol), PCTL_NOILP_ON_WAIT);
/* Return to original core */
ai_setcoreidx(sih, origidx);
} }
/* initialize PMU chip controls and other chip level stuff */ /* initialize PMU chip controls and other chip level stuff */
...@@ -369,13 +372,11 @@ void si_pmu_pll_init(struct si_pub *sih, uint xtalfreq) ...@@ -369,13 +372,11 @@ void si_pmu_pll_init(struct si_pub *sih, uint xtalfreq)
/* initialize PMU resources */ /* initialize PMU resources */
void si_pmu_res_init(struct si_pub *sih) void si_pmu_res_init(struct si_pub *sih)
{ {
struct chipcregs __iomem *cc; struct bcma_device *core;
uint origidx;
u32 min_mask = 0, max_mask = 0; u32 min_mask = 0, max_mask = 0;
/* Remember original core before switch to chipc */ /* select to chipc */
origidx = ai_coreidx(sih); core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
cc = ai_setcoreidx(sih, SI_CC_IDX);
/* Determine min/max rsrc masks */ /* Determine min/max rsrc masks */
si_pmu_res_masks(sih, &min_mask, &max_mask); si_pmu_res_masks(sih, &min_mask, &max_mask);
...@@ -385,55 +386,50 @@ void si_pmu_res_init(struct si_pub *sih) ...@@ -385,55 +386,50 @@ void si_pmu_res_init(struct si_pub *sih)
/* Program max resource mask */ /* Program max resource mask */
if (max_mask) if (max_mask)
W_REG(&cc->max_res_mask, max_mask); bcma_write32(core, CHIPCREGOFFS(max_res_mask), max_mask);
/* Program min resource mask */ /* Program min resource mask */
if (min_mask) if (min_mask)
W_REG(&cc->min_res_mask, min_mask); bcma_write32(core, CHIPCREGOFFS(min_res_mask), min_mask);
/* Add some delay; allow resources to come up and settle. */ /* Add some delay; allow resources to come up and settle. */
mdelay(2); mdelay(2);
/* Return to original core */
ai_setcoreidx(sih, origidx);
} }
u32 si_pmu_measure_alpclk(struct si_pub *sih) u32 si_pmu_measure_alpclk(struct si_pub *sih)
{ {
struct chipcregs __iomem *cc; struct bcma_device *core;
uint origidx;
u32 alp_khz; u32 alp_khz;
if (ai_get_pmurev(sih) < 10) if (ai_get_pmurev(sih) < 10)
return 0; return 0;
/* Remember original core before switch to chipc */ /* Remember original core before switch to chipc */
origidx = ai_coreidx(sih); core = ai_findcore(sih, BCMA_CORE_CHIPCOMMON, 0);
cc = ai_setcoreidx(sih, SI_CC_IDX);
if (R_REG(&cc->pmustatus) & PST_EXTLPOAVAIL) { if (bcma_read32(core, CHIPCREGOFFS(pmustatus)) & PST_EXTLPOAVAIL) {
u32 ilp_ctr, alp_hz; u32 ilp_ctr, alp_hz;
/* /*
* Enable the reg to measure the freq, * Enable the reg to measure the freq,
* in case it was disabled before * in case it was disabled before
*/ */
W_REG(&cc->pmu_xtalfreq, bcma_write32(core, CHIPCREGOFFS(pmu_xtalfreq),
1U << PMU_XTALFREQ_REG_MEASURE_SHIFT); 1U << PMU_XTALFREQ_REG_MEASURE_SHIFT);
/* Delay for well over 4 ILP clocks */ /* Delay for well over 4 ILP clocks */
udelay(1000); udelay(1000);
/* Read the latched number of ALP ticks per 4 ILP ticks */ /* Read the latched number of ALP ticks per 4 ILP ticks */
ilp_ctr = ilp_ctr = bcma_read32(core, CHIPCREGOFFS(pmu_xtalfreq)) &
R_REG(&cc->pmu_xtalfreq) & PMU_XTALFREQ_REG_ILPCTR_MASK; PMU_XTALFREQ_REG_ILPCTR_MASK;
/* /*
* Turn off the PMU_XTALFREQ_REG_MEASURE_SHIFT * Turn off the PMU_XTALFREQ_REG_MEASURE_SHIFT
* bit to save power * bit to save power
*/ */
W_REG(&cc->pmu_xtalfreq, 0); bcma_write32(core, CHIPCREGOFFS(pmu_xtalfreq), 0);
/* Calculate ALP frequency */ /* Calculate ALP frequency */
alp_hz = (ilp_ctr * EXT_ILP_HZ) / 4; alp_hz = (ilp_ctr * EXT_ILP_HZ) / 4;
...@@ -446,8 +442,5 @@ u32 si_pmu_measure_alpclk(struct si_pub *sih) ...@@ -446,8 +442,5 @@ u32 si_pmu_measure_alpclk(struct si_pub *sih)
} else } else
alp_khz = 0; alp_khz = 0;
/* Return to original core */
ai_setcoreidx(sih, origidx);
return alp_khz; return alp_khz;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7