aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ssb
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2010-02-19 13:02:44 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-02-19 15:52:51 -0500
commitac5b4e168ebd9046a6cd066d50b3341353f2f309 (patch)
tree2420840ac1887774ad756e51a7ae0df739aa9123 /drivers/ssb
parentd8728ee919282c7b01b65cd479ec1e2a9c5d3ba8 (diff)
ssb: Add PCI ID 0x4322 to PHU handling
Some of the N PHYs need a revision in the handling of the PMU. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb')
-rw-r--r--drivers/ssb/driver_chipcommon_pmu.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c
index 64abd11f6fbb..3d551245a4e2 100644
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -332,6 +332,12 @@ static void ssb_pmu_pll_init(struct ssb_chipcommon *cc)
332 case 0x5354: 332 case 0x5354:
333 ssb_pmu0_pllinit_r0(cc, crystalfreq); 333 ssb_pmu0_pllinit_r0(cc, crystalfreq);
334 break; 334 break;
335 case 0x4322:
336 if (cc->pmu.rev == 2) {
337 chipco_write32(cc, SSB_CHIPCO_PLLCTL_ADDR, 0x0000000A);
338 chipco_write32(cc, SSB_CHIPCO_PLLCTL_DATA, 0x380005C0);
339 }
340 break;
335 default: 341 default:
336 ssb_printk(KERN_ERR PFX 342 ssb_printk(KERN_ERR PFX
337 "ERROR: PLL init unknown for device %04X\n", 343 "ERROR: PLL init unknown for device %04X\n",
@@ -417,6 +423,7 @@ static void ssb_pmu_resources_init(struct ssb_chipcommon *cc)
417 423
418 switch (bus->chip_id) { 424 switch (bus->chip_id) {
419 case 0x4312: 425 case 0x4312:
426 case 0x4322:
420 /* We keep the default settings: 427 /* We keep the default settings:
421 * min_msk = 0xCBB 428 * min_msk = 0xCBB
422 * max_msk = 0x7FFFF 429 * max_msk = 0x7FFFF