Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / drivers / net / wireless / iwlwifi / iwl-2000.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
index aff555c4c49a97a829f52c665014ecb6a984c534..0e13f0bb2e178151789b5363006131ecd90b23d8 100644 (file)
--- 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)
        if (priv->cfg->iq_invert)
                iwl_set_bit(priv, CSR_GP_DRIVER_REG,
                            CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);
-
-       if (priv->cfg->disable_otp_refresh)
-               iwl_write_prph(priv, APMG_ANALOG_SVR_REG, 0x80000010);
 }
 
 static struct iwl_sensitivity_ranges iwl2000_sensitivity = {
@@ -267,8 +264,7 @@ static struct iwl_bt_params iwl2030_bt_params = {
        .need_dc_calib = true,                                  \
        .need_temp_offset_calib = true,                         \
        .led_mode = IWL_LED_RF_STATE,                           \
-       .iq_invert = true,                                      \
-       .disable_otp_refresh = true                             \
+       .iq_invert = true                                       \
 
 struct iwl_cfg iwl2000_2bgn_cfg = {
        .name = "2000 Series 2x2 BGN",
@@ -319,7 +315,8 @@ struct iwl_cfg iwl2030_2bg_cfg = {
        .need_temp_offset_calib = true,                         \
        .led_mode = IWL_LED_RF_STATE,                           \
        .adv_pm = true,                                         \
-       .rx_with_siso_diversity = true                          \
+       .rx_with_siso_diversity = true,                         \
+       .iq_invert = true                                       \
 
 struct iwl_cfg iwl105_bg_cfg = {
        .name = "105 Series 1x1 BG",
@@ -345,7 +342,8 @@ struct iwl_cfg iwl105_bgn_cfg = {
        .need_temp_offset_calib = true,                         \
        .led_mode = IWL_LED_RF_STATE,                           \
        .adv_pm = true,                                         \
-       .rx_with_siso_diversity = true                          \
+       .rx_with_siso_diversity = true,                         \
+       .iq_invert = true                                       \
 
 struct iwl_cfg iwl135_bg_cfg = {
        .name = "135 Series 1x1 BG/BT",