aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2011-07-18 19:58:58 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-07-21 10:32:38 -0400
commitd62b39e105e427510f8996c03db9ce1bf83fcad8 (patch)
tree383db5419c1eb90895260d35ee98937e1a0bf4e9
parente1b1c0875daa8ef396593270b5d3ec0b8483c1ea (diff)
iwlagn: remove "disable otp refresh" W/A
Remove the "disable otp refresh" work-around, not needed anymore. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-2000.c6
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.h2
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index 00480e4b377b..0e13f0bb2e17 100644
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
@@ -85,9 +85,6 @@ static void iwl2000_nic_config(struct iwl_priv *priv)
85 if (priv->cfg->iq_invert) 85 if (priv->cfg->iq_invert)
86 iwl_set_bit(priv, CSR_GP_DRIVER_REG, 86 iwl_set_bit(priv, CSR_GP_DRIVER_REG,
87 CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER); 87 CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);
88
89 if (priv->cfg->disable_otp_refresh)
90 iwl_write_prph(priv, APMG_ANALOG_SVR_REG, 0x80000010);
91} 88}
92 89
93static struct iwl_sensitivity_ranges iwl2000_sensitivity = { 90static struct iwl_sensitivity_ranges iwl2000_sensitivity = {
@@ -267,8 +264,7 @@ static struct iwl_bt_params iwl2030_bt_params = {
267 .need_dc_calib = true, \ 264 .need_dc_calib = true, \
268 .need_temp_offset_calib = true, \ 265 .need_temp_offset_calib = true, \
269 .led_mode = IWL_LED_RF_STATE, \ 266 .led_mode = IWL_LED_RF_STATE, \
270 .iq_invert = true, \ 267 .iq_invert = true \
271 .disable_otp_refresh = true \
272 268
273struct iwl_cfg iwl2000_2bgn_cfg = { 269struct iwl_cfg iwl2000_2bgn_cfg = {
274 .name = "2000 Series 2x2 BGN", 270 .name = "2000 Series 2x2 BGN",
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index c2d58dfb573c..3e6bb734dcb7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -212,7 +212,6 @@ struct iwl_ht_params {
212 * @rx_with_siso_diversity: 1x1 device with rx antenna diversity 212 * @rx_with_siso_diversity: 1x1 device with rx antenna diversity
213 * @internal_wimax_coex: internal wifi/wimax combo device 213 * @internal_wimax_coex: internal wifi/wimax combo device
214 * @iq_invert: I/Q inversion 214 * @iq_invert: I/Q inversion
215 * @disable_otp_refresh: disable OTP refresh current limit
216 * 215 *
217 * We enable the driver to be backward compatible wrt API version. The 216 * We enable the driver to be backward compatible wrt API version. The
218 * driver specifies which APIs it supports (with @ucode_api_max being the 217 * driver specifies which APIs it supports (with @ucode_api_max being the
@@ -258,7 +257,6 @@ struct iwl_cfg {
258 const bool rx_with_siso_diversity; 257 const bool rx_with_siso_diversity;
259 const bool internal_wimax_coex; 258 const bool internal_wimax_coex;
260 const bool iq_invert; 259 const bool iq_invert;
261 const bool disable_otp_refresh;
262}; 260};
263 261
264/*************************** 262/***************************