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

Commit 917b6777 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: remove BSM clock setting 



Again, a 4965 specific code path that we no
longer need in iwlagn.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 17445b8c

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

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ static struct iwl_base_params iwl1000_base_params = { 
	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

	.shadow_ram_support = false,

	.led_compensation = 51,

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

+0 −2
Original line number Diff line number Diff line
@@ -356,7 +356,6 @@ static struct iwl_base_params iwl2000_base_params = { 
	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.shadow_ram_support = true,

	.led_compensation = 51,
@@ -380,7 +379,6 @@ static struct iwl_base_params iwl2030_base_params = { 
	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.shadow_ram_support = true,

	.led_compensation = 57,

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

+0 −1
Original line number Diff line number Diff line
@@ -488,7 +488,6 @@ static struct iwl_base_params iwl5000_base_params = { 
	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.led_compensation = 51,

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,

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

+0 −3
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ static struct iwl_base_params iwl6000_base_params = { 
	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.shadow_ram_support = true,

	.led_compensation = 51,
@@ -482,7 +481,6 @@ static struct iwl_base_params iwl6050_base_params = { 
	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x50,

	.shadow_ram_support = true,

	.led_compensation = 51,
@@ -504,7 +502,6 @@ static struct iwl_base_params iwl6000_g2_base_params = { 
	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.shadow_ram_support = true,

	.led_compensation = 57,

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

+2 −10
Original line number Diff line number Diff line
@@ -1105,21 +1105,13 @@ int iwl_apm_init(struct iwl_priv *priv) 
	}



	/*

	 * Enable DMA and BSM (if used) clocks, wait for them to stabilize.

	 * BSM (Boostrap State Machine) is only in 3945 and 4965;

	 * later devices (i.e. 5000 and later) have non-volatile SRAM,

	 * and don't need BSM to restore data after power-saving sleep.

	 * Enable DMA clock and wait for it to stabilize.

	 *

	 * Write to "CLK_EN_REG"; "1" bits enable clocks, while "0" bits

	 * do not disable clocks.  This preserves any hardware bits already

	 * set by default in "CLK_CTRL_REG" after reset.

	 */

	if (priv->cfg->base_params->use_bsm)

		iwl_write_prph(priv, APMG_CLK_EN_REG,

			APMG_CLK_VAL_DMA_CLK_RQT | APMG_CLK_VAL_BSM_CLK_RQT);

	else

		iwl_write_prph(priv, APMG_CLK_EN_REG,

			APMG_CLK_VAL_DMA_CLK_RQT);

	iwl_write_prph(priv, APMG_CLK_EN_REG, APMG_CLK_VAL_DMA_CLK_RQT);

	udelay(20);



	/* Disable L1-Active */