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

Commit ab1f5a53 authored by John W. Linville's avatar John W. Linville
Browse files

Merge commit '4e6ce4dc' of... 

Merge commit '4e6ce4dc' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
parents f48ecb19 4e6ce4dc

drivers/bcma/host_pci.c

+3 −2
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend, 
static const struct pci_device_id bcma_pci_bridge_tbl[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4313) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43224) },	/* 0xa8d8 */

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
@@ -285,7 +285,8 @@ static const struct pci_device_id bcma_pci_bridge_tbl[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43a9) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x43aa) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },	/* 0xA8DB */

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43227) },	/* 0xa8db, BCM43217 (sic!) */

	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 43228) },	/* 0xa8dc */

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);

drivers/bcma/main.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static bool bcma_is_core_needed_early(u16 core_id) 
	return false;

}



#ifdef CONFIG_OF

#if defined(CONFIG_OF) && defined(CONFIG_OF_ADDRESS)

static struct device_node *bcma_of_find_child_device(struct platform_device *parent,

						     struct bcma_device *core)

{

drivers/net/wireless/ath/ath.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct reg_dmn_pair_mapping { 


struct ath_regulatory {

	char alpha2[2];

	enum nl80211_dfs_regions region;

	u16 country_code;

	u16 max_power_level;

	u16 current_rd;

drivers/net/wireless/ath/ath9k/ar9003_phy.c

+13 −0
Original line number Diff line number Diff line
@@ -664,6 +664,19 @@ static void ar9003_hw_override_ini(struct ath_hw *ah) 
		ah->enabled_cals |= TX_CL_CAL;

	else

		ah->enabled_cals &= ~TX_CL_CAL;



	if (AR_SREV_9340(ah) || AR_SREV_9531(ah) || AR_SREV_9550(ah)) {

		if (ah->is_clk_25mhz) {

			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x17c << 1);

			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f3d7);

			REG_WRITE(ah, AR_SLP32_INC, 0x0001e7ae);

		} else {

			REG_WRITE(ah, AR_RTC_DERIVED_CLK, 0x261 << 1);

			REG_WRITE(ah, AR_SLP32_MODE, 0x0010f400);

			REG_WRITE(ah, AR_SLP32_INC, 0x0001e800);

		}

		udelay(100);

	}

}



static void ar9003_hw_prog_ini(struct ath_hw *ah,

drivers/net/wireless/ath/ath9k/common.c

+4 −4
Original line number Diff line number Diff line
@@ -368,12 +368,12 @@ void ath9k_cmn_update_txpow(struct ath_hw *ah, u16 cur_txpow, 
{

	struct ath_regulatory *reg = ath9k_hw_regulatory(ah);



	if (reg->power_limit != new_txpow) {

	if (reg->power_limit != new_txpow)

		ath9k_hw_set_txpowerlimit(ah, new_txpow, false);



	/* read back in case value is clamped */

	*txpower = reg->max_power_level;

}

}

EXPORT_SYMBOL(ath9k_cmn_update_txpow);



void ath9k_cmn_init_crypto(struct ath_hw *ah)