diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-12 05:36:42 +0400 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-12 05:36:42 +0400 |
| commit | cbe461c526e1e0f8b55f91180df64f02d8daed45 (patch) | |
| tree | e0d785c63d550d81cb42960ac490aebef4bc965c /drivers/bcma/driver_chipcommon_pmu.c | |
| parent | 1d0c4da8f717937aeda47a72bc769d80f8776795 (diff) | |
| parent | 1c2e004183178e1947882cd2e74f37826f45230e (diff) | |
| download | linux-cbe461c526e1e0f8b55f91180df64f02d8daed45.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Conflicts:
net/bluetooth/hci_event.c
Diffstat (limited to 'drivers/bcma/driver_chipcommon_pmu.c')
| -rw-r--r-- | drivers/bcma/driver_chipcommon_pmu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bcma/driver_chipcommon_pmu.c b/drivers/bcma/driver_chipcommon_pmu.c index a058842f14fd..61ce4054b3c3 100644 --- a/drivers/bcma/driver_chipcommon_pmu.c +++ b/drivers/bcma/driver_chipcommon_pmu.c @@ -139,7 +139,9 @@ void bcma_pmu_workarounds(struct bcma_drv_cc *cc) bcma_chipco_chipctl_maskset(cc, 0, ~0, 0x7); break; case 0x4331: - /* BCM4331 workaround is SPROM-related, we put it in sprom.c */ + case 43431: + /* Ext PA lines must be enabled for tx on BCM4331 */ + bcma_chipco_bcm4331_ext_pa_lines_ctl(cc, true); break; case 43224: if (bus->chipinfo.rev == 0) { |