diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index ddd64fef3039..87957c052839 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -198,6 +198,7 @@ out: | |||
198 | } | 198 | } |
199 | 199 | ||
200 | 200 | ||
201 | /* NIC configuration for 5000 series and up */ | ||
201 | void iwl5000_nic_config(struct iwl_priv *priv) | 202 | void iwl5000_nic_config(struct iwl_priv *priv) |
202 | { | 203 | { |
203 | unsigned long flags; | 204 | unsigned long flags; |
@@ -239,18 +240,11 @@ void iwl5000_nic_config(struct iwl_priv *priv) | |||
239 | APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS, | 240 | APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS, |
240 | ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS); | 241 | ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS); |
241 | 242 | ||
242 | if ((priv->hw_rev & CSR_HW_REV_TYPE_MSK) == CSR_HW_REV_TYPE_1000) { | ||
243 | /* Setting digital SVR for 1000 card to 1.32V */ | ||
244 | iwl_set_bits_mask_prph(priv, APMG_DIGITAL_SVR_REG, | ||
245 | APMG_SVR_DIGITAL_VOLTAGE_1_32, | ||
246 | ~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK); | ||
247 | } | ||
248 | 243 | ||
249 | spin_unlock_irqrestore(&priv->lock, flags); | 244 | spin_unlock_irqrestore(&priv->lock, flags); |
250 | } | 245 | } |
251 | 246 | ||
252 | 247 | ||
253 | |||
254 | /* | 248 | /* |
255 | * EEPROM | 249 | * EEPROM |
256 | */ | 250 | */ |