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>

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);