bcma: fix invalid PMU chip control masks

Commit b9562545ef0b ("bcma: complete workaround for BCMA43224 and
BCM4313") introduced the wrong masks for setting the chip control
registers - the "mask" parameter is inverse.

It should be the mask of bits *not* changed, which is admittedly a bit
non-intuitive.

The incorrect mask not only causes the driver to not work correctly on
the chips affected (eg the BCM43224 on the Macbook Air 4,2) but the
state persists over a soft reset, causing the next boot to not
necessarily see the device correctly.

Reported-and-tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Tested-by: Seth Forshee <seth.forshee@canonical.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Arend Van Spriel <arend@broadcom.com>
Cc: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/bcma/driver_chipcommon_pmu.c b/drivers/bcma/driver_chipcommon_pmu.c
index 4432617..c9a4f46 100644 (file)
--- a/drivers/bcma/driver_chipcommon_pmu.c
+++ b/drivers/bcma/driver_chipcommon_pmu.c
@@ -110,7 +110,7 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc)
                /* enable 12 mA drive strenth for 4313 and set chipControl
                   register bit 1 */
                bcma_chipco_chipctl_maskset(cc, 0,
-                                           BCMA_CCTRL_4313_12MA_LED_DRIVE,
+                                           ~BCMA_CCTRL_4313_12MA_LED_DRIVE,
                                            BCMA_CCTRL_4313_12MA_LED_DRIVE);
                break;
        case BCMA_CHIP_ID_BCM4331:
@@ -124,14 +124,14 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc)
                   register bit 15 */
                if (bus->chipinfo.rev == 0) {
                        bcma_cc_maskset32(cc, BCMA_CC_CHIPCTL,
-                                         BCMA_CCTRL_43224_GPIO_TOGGLE,
+                                         ~BCMA_CCTRL_43224_GPIO_TOGGLE,
                                          BCMA_CCTRL_43224_GPIO_TOGGLE);
                        bcma_chipco_chipctl_maskset(cc, 0,
-                                                   BCMA_CCTRL_43224A0_12MA_LED_DRIVE,
+                                                   ~BCMA_CCTRL_43224A0_12MA_LED_DRIVE,
                                                    BCMA_CCTRL_43224A0_12MA_LED_DRIVE);
                } else {
                        bcma_chipco_chipctl_maskset(cc, 0,
-                                                   BCMA_CCTRL_43224B0_12MA_LED_DRIVE,
+                                                   ~BCMA_CCTRL_43224B0_12MA_LED_DRIVE,
                                                    BCMA_CCTRL_43224B0_12MA_LED_DRIVE);
                }
                break;