iwlagn: remove BSM clock setting
Again, a 4965 specific code path that we no longer need in iwlagn. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
17445b8c44
commit
917b6777b4
|
@ -249,7 +249,6 @@ static struct iwl_base_params iwl1000_base_params = {
|
||||||
.eeprom_size = OTP_LOW_IMAGE_SIZE,
|
.eeprom_size = OTP_LOW_IMAGE_SIZE,
|
||||||
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
|
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
|
||||||
.set_l0s = true,
|
.set_l0s = true,
|
||||||
.use_bsm = false,
|
|
||||||
.max_ll_items = OTP_MAX_LL_ITEMS_1000,
|
.max_ll_items = OTP_MAX_LL_ITEMS_1000,
|
||||||
.shadow_ram_support = false,
|
.shadow_ram_support = false,
|
||||||
.led_compensation = 51,
|
.led_compensation = 51,
|
||||||
|
|
|
@ -356,7 +356,6 @@ static struct iwl_base_params iwl2000_base_params = {
|
||||||
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
||||||
.pll_cfg_val = 0,
|
.pll_cfg_val = 0,
|
||||||
.set_l0s = true,
|
.set_l0s = true,
|
||||||
.use_bsm = false,
|
|
||||||
.max_ll_items = OTP_MAX_LL_ITEMS_2x00,
|
.max_ll_items = OTP_MAX_LL_ITEMS_2x00,
|
||||||
.shadow_ram_support = true,
|
.shadow_ram_support = true,
|
||||||
.led_compensation = 51,
|
.led_compensation = 51,
|
||||||
|
@ -380,7 +379,6 @@ static struct iwl_base_params iwl2030_base_params = {
|
||||||
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
||||||
.pll_cfg_val = 0,
|
.pll_cfg_val = 0,
|
||||||
.set_l0s = true,
|
.set_l0s = true,
|
||||||
.use_bsm = false,
|
|
||||||
.max_ll_items = OTP_MAX_LL_ITEMS_2x00,
|
.max_ll_items = OTP_MAX_LL_ITEMS_2x00,
|
||||||
.shadow_ram_support = true,
|
.shadow_ram_support = true,
|
||||||
.led_compensation = 57,
|
.led_compensation = 57,
|
||||||
|
|
|
@ -488,7 +488,6 @@ static struct iwl_base_params iwl5000_base_params = {
|
||||||
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
||||||
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
|
.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,
|
||||||
.set_l0s = true,
|
.set_l0s = true,
|
||||||
.use_bsm = false,
|
|
||||||
.led_compensation = 51,
|
.led_compensation = 51,
|
||||||
.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
|
.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
|
||||||
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
|
.plcp_delta_threshold = IWL_MAX_PLCP_ERR_LONG_THRESHOLD_DEF,
|
||||||
|
|
|
@ -459,7 +459,6 @@ static struct iwl_base_params iwl6000_base_params = {
|
||||||
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
||||||
.pll_cfg_val = 0,
|
.pll_cfg_val = 0,
|
||||||
.set_l0s = true,
|
.set_l0s = true,
|
||||||
.use_bsm = false,
|
|
||||||
.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
|
.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
|
||||||
.shadow_ram_support = true,
|
.shadow_ram_support = true,
|
||||||
.led_compensation = 51,
|
.led_compensation = 51,
|
||||||
|
@ -482,7 +481,6 @@ static struct iwl_base_params iwl6050_base_params = {
|
||||||
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
||||||
.pll_cfg_val = 0,
|
.pll_cfg_val = 0,
|
||||||
.set_l0s = true,
|
.set_l0s = true,
|
||||||
.use_bsm = false,
|
|
||||||
.max_ll_items = OTP_MAX_LL_ITEMS_6x50,
|
.max_ll_items = OTP_MAX_LL_ITEMS_6x50,
|
||||||
.shadow_ram_support = true,
|
.shadow_ram_support = true,
|
||||||
.led_compensation = 51,
|
.led_compensation = 51,
|
||||||
|
@ -504,7 +502,6 @@ static struct iwl_base_params iwl6000_g2_base_params = {
|
||||||
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
|
||||||
.pll_cfg_val = 0,
|
.pll_cfg_val = 0,
|
||||||
.set_l0s = true,
|
.set_l0s = true,
|
||||||
.use_bsm = false,
|
|
||||||
.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
|
.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
|
||||||
.shadow_ram_support = true,
|
.shadow_ram_support = true,
|
||||||
.led_compensation = 57,
|
.led_compensation = 57,
|
||||||
|
|
|
@ -1105,21 +1105,13 @@ int iwl_apm_init(struct iwl_priv *priv)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Enable DMA and BSM (if used) clocks, wait for them to stabilize.
|
* Enable DMA clock and wait for it 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.
|
|
||||||
*
|
*
|
||||||
* Write to "CLK_EN_REG"; "1" bits enable clocks, while "0" bits
|
* Write to "CLK_EN_REG"; "1" bits enable clocks, while "0" bits
|
||||||
* do not disable clocks. This preserves any hardware bits already
|
* do not disable clocks. This preserves any hardware bits already
|
||||||
* set by default in "CLK_CTRL_REG" after reset.
|
* 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);
|
||||||
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);
|
|
||||||
udelay(20);
|
udelay(20);
|
||||||
|
|
||||||
/* Disable L1-Active */
|
/* Disable L1-Active */
|
||||||
|
|
|
@ -283,7 +283,6 @@ struct iwl_base_params {
|
||||||
/* for iwl_apm_init() */
|
/* for iwl_apm_init() */
|
||||||
u32 pll_cfg_val;
|
u32 pll_cfg_val;
|
||||||
bool set_l0s;
|
bool set_l0s;
|
||||||
bool use_bsm;
|
|
||||||
|
|
||||||
const u16 max_ll_items;
|
const u16 max_ll_items;
|
||||||
const bool shadow_ram_support;
|
const bool shadow_ram_support;
|
||||||
|
|
Reference in New Issue