Commit 00eeedcf084a21bf436ff3147f11f0923c811155
Committed by
John W. Linville
John W. Linville
1 parent
1960195725
Exists in
master
and in
20 other branches
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>
Showing 2 changed files with 4 additions and 0 deletions Side-by-side Diff
drivers/bcma/driver_chipcommon_pmu.c
| ... | ... | @@ -123,8 +123,11 @@ |
| 123 | 123 | val |= BCMA_CHIPCTL_4331_EXTPA_EN; |
| 124 | 124 | if (bus->chipinfo.pkg == 9 || bus->chipinfo.pkg == 11) |
| 125 | 125 | val |= BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5; |
| 126 | + else if (bus->chipinfo.rev > 0) | |
| 127 | + val |= BCMA_CHIPCTL_4331_EXTPA_EN2; | |
| 126 | 128 | } else { |
| 127 | 129 | val &= ~BCMA_CHIPCTL_4331_EXTPA_EN; |
| 130 | + val &= ~BCMA_CHIPCTL_4331_EXTPA_EN2; | |
| 128 | 131 | val &= ~BCMA_CHIPCTL_4331_EXTPA_ON_GPIO2_5; |
| 129 | 132 | } |
| 130 | 133 | bcma_cc_write32(cc, BCMA_CC_CHIPCTL, val); |
include/linux/bcma/bcma_driver_chipcommon.h
| ... | ... | @@ -321,6 +321,7 @@ |
| 321 | 321 | #define BCMA_CHIPCTL_4331_OVR_PIPEAUXPWRDOWN BIT(9) /* override core control on pipe_AuxPowerDown */ |
| 322 | 322 | #define BCMA_CHIPCTL_4331_PCIE_AUXCLKEN BIT(10) /* pcie_auxclkenable */ |
| 323 | 323 | #define BCMA_CHIPCTL_4331_PCIE_PIPE_PLLDOWN BIT(11) /* pcie_pipe_pllpowerdown */ |
| 324 | +#define BCMA_CHIPCTL_4331_EXTPA_EN2 BIT(12) /* 0 ext pa disable, 1 ext pa enabled */ | |
| 324 | 325 | #define BCMA_CHIPCTL_4331_BT_SHD0_ON_GPIO4 BIT(16) /* enable bt_shd0 at gpio4 */ |
| 325 | 326 | #define BCMA_CHIPCTL_4331_BT_SHD1_ON_GPIO5 BIT(17) /* enable bt_shd1 at gpio5 */ |
| 326 | 327 |