diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-06-30 01:44:37 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:36:02 -0400 |
| commit | 00eeedcf084a21bf436ff3147f11f0923c811155 (patch) | |
| tree | 5aecf06b34d6ab3bde12b8f2fe5c33dcd1b06116 /drivers/bcma | |
| parent | 19601957252413676ff107faf0fb00a80874c253 (diff) | |
| download | blackbird-op-linux-00eeedcf084a21bf436ff3147f11f0923c811155.tar.gz blackbird-op-linux-00eeedcf084a21bf436ff3147f11f0923c811155.zip | |
bcma: extend workaround for bcm4331
This patch is based on a recent version of the Broadcom SDK.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma')
| -rw-r--r-- | drivers/bcma/driver_chipcommon_pmu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bcma/driver_chipcommon_pmu.c b/drivers/bcma/driver_chipcommon_pmu.c index 61ce4054b3c3..f18df1f392ec 100644 --- a/drivers/bcma/driver_chipcommon_pmu.c +++ b/drivers/bcma/driver_chipcommon_pmu.c @@ -123,8 +123,11 @@ void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable) val |= BCMA_CHIPCTL_4331_EXTPA_EN; if (bus->chipinfo.pkg == 9 || bus->chipinfo.pkg == 11) val |= BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5; + else if (bus->chipinfo.rev > 0) + val |= BCMA_CHIPCTL_4331_EXTPA_EN2; } else { val &= ~BCMA_CHIPCTL_4331_EXTPA_EN; + val &= ~BCMA_CHIPCTL_4331_EXTPA_EN2; val &= ~BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5; } bcma_cc_write32(cc, BCMA_CC_CHIPCTL, val); |
