Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth (cbe461c5) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/bcma/driver_chipcommon_pmu.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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) {

drivers/bcma/sprom.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -579,13 +579,13 @@ int bcma_sprom_get(struct bcma_bus *bus)
		if (!sprom)
		return -ENOMEM;

		if (bus->chipinfo.id == 0x4331)
		if (bus->chipinfo.id == 0x4331 \|\| bus->chipinfo.id == 43431)
		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, false);

		pr_debug("SPROM offset 0x%x\n", offset);
		bcma_sprom_read(bus, offset, sprom);

		if (bus->chipinfo.id == 0x4331)
		if (bus->chipinfo.id == 0x4331 \|\| bus->chipinfo.id == 43431)
		bcma_chipco_bcm4331_ext_pa_lines_ctl(&bus->drv_cc, true);

		err = bcma_sprom_valid(sprom);

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -89,9 +89,9 @@ int brcmf_sdio_intr_register(struct brcmf_sdio_dev *sdiodev)
		data \|= 1 << SDIO_FUNC_1 \| 1 << SDIO_FUNC_2 \| 1;
		brcmf_sdio_regwb(sdiodev, SDIO_CCCR_IENx, data, &ret);

		/* redirect, configure ane enable io for interrupt signal */
		/* redirect, configure and enable io for interrupt signal */
		data = SDIO_SEPINT_MASK \| SDIO_SEPINT_OE;
		if (sdiodev->irq_flags \| IRQF_TRIGGER_HIGH)
		if (sdiodev->irq_flags & IRQF_TRIGGER_HIGH)
		data \|= SDIO_SEPINT_ACT_HI;
		brcmf_sdio_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, &ret);

drivers/net/wireless/iwlwifi/iwl-eeprom.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -568,28 +568,28 @@ static int iwl_find_otp_image(struct iwl_trans *trans,
		* iwl_get_max_txpower_avg - get the highest tx power from all chains.
		* find the highest tx power from all chains for the channel
		*/
		static s8 iwl_get_max_txpower_avg(const struct iwl_cfg *cfg,
		static s8 iwl_get_max_txpower_avg(struct iwl_priv *priv,
		struct iwl_eeprom_enhanced_txpwr *enhanced_txpower,
		int element, s8 *max_txpower_in_half_dbm)
		{
		s8 max_txpower_avg = 0; /* (dBm) */

		/* Take the highest tx power from any valid chains */
		if ((cfg->valid_tx_ant & ANT_A) &&
		if ((priv->hw_params.valid_tx_ant & ANT_A) &&
		(enhanced_txpower[element].chain_a_max > max_txpower_avg))
		max_txpower_avg = enhanced_txpower[element].chain_a_max;
		if ((cfg->valid_tx_ant & ANT_B) &&
		if ((priv->hw_params.valid_tx_ant & ANT_B) &&
		(enhanced_txpower[element].chain_b_max > max_txpower_avg))
		max_txpower_avg = enhanced_txpower[element].chain_b_max;
		if ((cfg->valid_tx_ant & ANT_C) &&
		if ((priv->hw_params.valid_tx_ant & ANT_C) &&
		(enhanced_txpower[element].chain_c_max > max_txpower_avg))
		max_txpower_avg = enhanced_txpower[element].chain_c_max;
		if (((cfg->valid_tx_ant == ANT_AB) \|
		(cfg->valid_tx_ant == ANT_BC) \|
		(cfg->valid_tx_ant == ANT_AC)) &&
		if (((priv->hw_params.valid_tx_ant == ANT_AB) \|
		(priv->hw_params.valid_tx_ant == ANT_BC) \|
		(priv->hw_params.valid_tx_ant == ANT_AC)) &&
		(enhanced_txpower[element].mimo2_max > max_txpower_avg))
		max_txpower_avg = enhanced_txpower[element].mimo2_max;
		if ((cfg->valid_tx_ant == ANT_ABC) &&
		if ((priv->hw_params.valid_tx_ant == ANT_ABC) &&
		(enhanced_txpower[element].mimo3_max > max_txpower_avg))
		max_txpower_avg = enhanced_txpower[element].mimo3_max;

		@@ -691,7 +691,7 @@ static void iwl_eeprom_enhanced_txpower(struct iwl_priv *priv)
		((txp->delta_20_in_40 & 0xf0) >> 4),
		(txp->delta_20_in_40 & 0x0f));

		max_txp_avg = iwl_get_max_txpower_avg(priv->cfg, txp_array, idx,
		max_txp_avg = iwl_get_max_txpower_avg(priv, txp_array, idx,
		&max_txp_avg_halfdbm);

		/*

drivers/net/wireless/iwlwifi/iwl-mac80211.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
		WIPHY_FLAG_DISABLE_BEACON_HINTS \|
		WIPHY_FLAG_IBSS_RSN;

		#ifdef CONFIG_PM_SLEEP
		if (priv->fw->img[IWL_UCODE_WOWLAN].sec[0].len &&
		priv->trans->ops->wowlan_suspend &&
		device_can_wakeup(priv->trans->dev)) {
		@@ -217,6 +218,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
		hw->wiphy->wowlan.pattern_max_len =
		IWLAGN_WOWLAN_MAX_PATTERN_LEN;
		}
		#endif

		if (iwlwifi_mod_params.power_save)
		hw->wiphy->flags \|= WIPHY_FLAG_PS_ON_BY_DEFAULT;