Commit c35deb4e authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville

ssb: update PMU init to match specs

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2daf6c15
...@@ -502,9 +502,9 @@ static void ssb_pmu_resources_init(struct ssb_chipcommon *cc) ...@@ -502,9 +502,9 @@ static void ssb_pmu_resources_init(struct ssb_chipcommon *cc)
chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk); chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk);
} }
/* http://bcm-v4.sipsolutions.net/802.11/SSB/PmuInit */
void ssb_pmu_init(struct ssb_chipcommon *cc) void ssb_pmu_init(struct ssb_chipcommon *cc)
{ {
struct ssb_bus *bus = cc->dev->bus;
u32 pmucap; u32 pmucap;
if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU)) if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
...@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon *cc) ...@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon *cc)
ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n", ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
cc->pmu.rev, pmucap); cc->pmu.rev, pmucap);
if (cc->pmu.rev >= 1) { if (cc->pmu.rev == 1)
if ((bus->chip_id == 0x4325) && (bus->chip_rev < 2)) { chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
chipco_mask32(cc, SSB_CHIPCO_PMU_CTL, ~SSB_CHIPCO_PMU_CTL_NOILPONW);
~SSB_CHIPCO_PMU_CTL_NOILPONW); else
} else { chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
chipco_set32(cc, SSB_CHIPCO_PMU_CTL, SSB_CHIPCO_PMU_CTL_NOILPONW);
SSB_CHIPCO_PMU_CTL_NOILPONW);
}
}
ssb_pmu_pll_init(cc); ssb_pmu_pll_init(cc);
ssb_pmu_resources_init(cc); ssb_pmu_resources_init(cc);
} }
......
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