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

Commit 15ade3ca authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: remove un-needed configuration 



After driver split, set_l0s config is no longer needed, remove it

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 6bb64697

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

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

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.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
@@ -343,7 +343,6 @@ static struct iwl_base_params iwl2000_base_params = { 
	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.max_ll_items = OTP_MAX_LL_ITEMS_2x00,

	.shadow_ram_support = true,

	.led_compensation = 51,
@@ -366,7 +365,6 @@ static struct iwl_base_params iwl2030_base_params = { 
	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.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
@@ -464,7 +464,6 @@ static struct iwl_base_params iwl5000_base_params = { 
	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.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
@@ -432,7 +432,6 @@ static struct iwl_base_params iwl6000_base_params = { 
	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.shadow_ram_support = true,

	.led_compensation = 51,
@@ -454,7 +453,6 @@ static struct iwl_base_params iwl6050_base_params = { 
	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x50,

	.shadow_ram_support = true,

	.led_compensation = 51,
@@ -475,7 +473,6 @@ static struct iwl_base_params iwl6000_g2_base_params = { 
	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.pll_cfg_val = 0,

	.set_l0s = true,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.shadow_ram_support = true,

	.led_compensation = 57,

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

+12 −14
Original line number Diff line number Diff line
@@ -1061,7 +1061,6 @@ int iwl_apm_init(struct iwl_priv *priv) 
	 * If not (unlikely), enable L0S, so there is at least some

	 *    power savings, even without L1.

	 */

	if (priv->cfg->base_params->set_l0s) {

	lctl = iwl_pcie_link_ctl(priv);

	if ((lctl & PCI_CFG_LINK_CTRL_VAL_L1_EN) ==

				PCI_CFG_LINK_CTRL_VAL_L1_EN) {
@@ -1075,7 +1074,6 @@ int iwl_apm_init(struct iwl_priv *priv) 
				CSR_GIO_REG_VAL_L0S_ENABLED);

		IWL_DEBUG_POWER(priv, "L1 Disabled; Enabling L0S\n");

	}

	}



	/* Configure analog phase-lock-loop before activating to D0A */

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