Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit c35deb4e70d52ed564c58569fe059dd7ca5f4eec

Authored by Rafał Miłecki
Committed by John W. Linville
1 parent 2daf6c1575
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ssb: update PMU init to match specs 

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 1 changed file with 7 additions and 10 deletions Side-by-side Diff

drivers/ssb/driver_chipcommon_pmu.c
Diff comments   View file @ c35deb4
... ... @@ -502,9 +502,9 @@
502 502 chipco_write32(cc, SSB_CHIPCO_PMU_MAXRES_MSK, max_msk);
503 503 }
504 504  
  505 +/* http://bcm-v4.sipsolutions.net/802.11/SSB/PmuInit */
505 506 void ssb_pmu_init(struct ssb_chipcommon *cc)
506 507 {
507   - struct ssb_bus *bus = cc->dev->bus;
508 508 u32 pmucap;
509 509  
510 510 if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
... ... @@ -516,15 +516,12 @@
516 516 ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
517 517 cc->pmu.rev, pmucap);
518 518  
519   - if (cc->pmu.rev >= 1) {
520   - if ((bus->chip_id == 0x4325) && (bus->chip_rev < 2)) {
521   - chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
522   - ~SSB_CHIPCO_PMU_CTL_NOILPONW);
523   - } else {
524   - chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
525   - SSB_CHIPCO_PMU_CTL_NOILPONW);
526   - }
527   - }
  519 + if (cc->pmu.rev == 1)
  520 + chipco_mask32(cc, SSB_CHIPCO_PMU_CTL,
  521 + ~SSB_CHIPCO_PMU_CTL_NOILPONW);
  522 + else
  523 + chipco_set32(cc, SSB_CHIPCO_PMU_CTL,
  524 + SSB_CHIPCO_PMU_CTL_NOILPONW);
528 525 ssb_pmu_pll_init(cc);
529 526 ssb_pmu_resources_init(cc);
530 527 }