summaryrefslogtreecommitdiff
path: root/drivers/ssb
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-10-25 18:39:29 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-10-29 15:30:37 -0400
commit42d36074e53eadfd79e6db518b5caf8fba914f8b (patch)
treefaca7a4b3d1f71ed66b42f7d2f96277dbe7182dd /drivers/ssb
parent2c60035a69b3c4b0b8d74046aadd26baed9a8ae6 (diff)
downloadlinux-3.10-42d36074e53eadfd79e6db518b5caf8fba914f8b.tar.gz
linux-3.10-42d36074e53eadfd79e6db518b5caf8fba914f8b.tar.bz2
linux-3.10-42d36074e53eadfd79e6db518b5caf8fba914f8b.zip
ssb: handle BCM43222 in pmu code.
The BCM43222 with the chipid 43222 or 0xa8d6 in hex do not need any special handling in the pmu code. This prevents some error messages being shown. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb')
-rw-r--r--drivers/ssb/driver_chipcommon_pmu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
index b58fef780ea..d7d58044b4b 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -346,6 +346,8 @@ static void ssb_pmu_pll_init(struct ssb_chipcommon *cc)
chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, 0x380005C0);
}
break;
+ case 43222:
+ break;
default:
ssb_printk(KERN_ERR PFX
"ERROR: PLL init unknown for device %04X\n",
@@ -434,6 +436,7 @@ static void ssb_pmu_resources_init(struct ssb_chipcommon *cc)
min_msk = 0xCBB;
break;
case 0x4322:
+ case 43222:
/* We keep the default settings:
* min_msk = 0xCBB
* max_msk = 0x7FFFF