Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00eeedcf authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

bcma: extend workaround for bcm4331 



This patch is based on a recent version of the Broadcom SDK.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 19601957

drivers/bcma/driver_chipcommon_pmu.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

include/linux/bcma/bcma_driver_chipcommon.h

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ 
#define BCMA_CHIPCTL_4331_OVR_PIPEAUXPWRDOWN	BIT(9)	/* override core control on pipe_AuxPowerDown */

#define BCMA_CHIPCTL_4331_PCIE_AUXCLKEN		BIT(10)	/* pcie_auxclkenable */

#define BCMA_CHIPCTL_4331_PCIE_PIPE_PLLDOWN	BIT(11)	/* pcie_pipe_pllpowerdown */

#define BCMA_CHIPCTL_4331_EXTPA_EN2		BIT(12)	/* 0 ext pa disable, 1 ext pa enabled */

#define BCMA_CHIPCTL_4331_BT_SHD0_ON_GPIO4	BIT(16)	/* enable bt_shd0 at gpio4 */

#define BCMA_CHIPCTL_4331_BT_SHD1_ON_GPIO5	BIT(17)	/* enable bt_shd1 at gpio5 */