提交 cf61686a 编写于 作者: J Johannes Berg 提交者: John W. Linville

iwlwifi: remove iq_invert config param

This is used only by 2000 class devices, but
they all use it so remove the configuration
parameter and hard-code the programming.
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
Signed-off-by: NWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 85560af3
...@@ -86,9 +86,8 @@ static void iwl2000_nic_config(struct iwl_priv *priv) ...@@ -86,9 +86,8 @@ static void iwl2000_nic_config(struct iwl_priv *priv)
{ {
iwl_rf_config(priv); iwl_rf_config(priv);
if (cfg(priv)->iq_invert) iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,
iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG, CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);
CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);
} }
static const struct iwl_sensitivity_ranges iwl2000_sensitivity = { static const struct iwl_sensitivity_ranges iwl2000_sensitivity = {
...@@ -234,8 +233,7 @@ static const struct iwl_bt_params iwl2030_bt_params = { ...@@ -234,8 +233,7 @@ static const struct iwl_bt_params iwl2030_bt_params = {
.base_params = &iwl2000_base_params, \ .base_params = &iwl2000_base_params, \
.need_temp_offset_calib = true, \ .need_temp_offset_calib = true, \
.temp_offset_v2 = true, \ .temp_offset_v2 = true, \
.led_mode = IWL_LED_RF_STATE, \ .led_mode = IWL_LED_RF_STATE
.iq_invert = true \
const struct iwl_cfg iwl2000_2bgn_cfg = { const struct iwl_cfg iwl2000_2bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 2200 BGN", .name = "Intel(R) Centrino(R) Wireless-N 2200 BGN",
...@@ -264,8 +262,7 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { ...@@ -264,8 +262,7 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = {
.need_temp_offset_calib = true, \ .need_temp_offset_calib = true, \
.temp_offset_v2 = true, \ .temp_offset_v2 = true, \
.led_mode = IWL_LED_RF_STATE, \ .led_mode = IWL_LED_RF_STATE, \
.adv_pm = true, \ .adv_pm = true
.iq_invert = true \
const struct iwl_cfg iwl2030_2bgn_cfg = { const struct iwl_cfg iwl2030_2bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN", .name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",
...@@ -288,8 +285,7 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { ...@@ -288,8 +285,7 @@ const struct iwl_cfg iwl2030_2bgn_cfg = {
.temp_offset_v2 = true, \ .temp_offset_v2 = true, \
.led_mode = IWL_LED_RF_STATE, \ .led_mode = IWL_LED_RF_STATE, \
.adv_pm = true, \ .adv_pm = true, \
.rx_with_siso_diversity = true, \ .rx_with_siso_diversity = true
.iq_invert = true \
const struct iwl_cfg iwl105_bgn_cfg = { const struct iwl_cfg iwl105_bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 105 BGN", .name = "Intel(R) Centrino(R) Wireless-N 105 BGN",
...@@ -319,8 +315,7 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { ...@@ -319,8 +315,7 @@ const struct iwl_cfg iwl105_bgn_d_cfg = {
.temp_offset_v2 = true, \ .temp_offset_v2 = true, \
.led_mode = IWL_LED_RF_STATE, \ .led_mode = IWL_LED_RF_STATE, \
.adv_pm = true, \ .adv_pm = true, \
.rx_with_siso_diversity = true, \ .rx_with_siso_diversity = true
.iq_invert = true \
const struct iwl_cfg iwl135_bgn_cfg = { const struct iwl_cfg iwl135_bgn_cfg = {
.name = "Intel(R) Centrino(R) Wireless-N 135 BGN", .name = "Intel(R) Centrino(R) Wireless-N 135 BGN",
......
...@@ -302,7 +302,6 @@ struct iwl_ht_params { ...@@ -302,7 +302,6 @@ struct iwl_ht_params {
* @adv_pm: advance power management * @adv_pm: advance power management
* @rx_with_siso_diversity: 1x1 device with rx antenna diversity * @rx_with_siso_diversity: 1x1 device with rx antenna diversity
* @internal_wimax_coex: internal wifi/wimax combo device * @internal_wimax_coex: internal wifi/wimax combo device
* @iq_invert: I/Q inversion
* @temp_offset_v2: support v2 of temperature offset calibration * @temp_offset_v2: support v2 of temperature offset calibration
* *
* We enable the driver to be backward compatible wrt. hardware features. * We enable the driver to be backward compatible wrt. hardware features.
...@@ -336,7 +335,6 @@ struct iwl_cfg { ...@@ -336,7 +335,6 @@ struct iwl_cfg {
const bool adv_pm; const bool adv_pm;
const bool rx_with_siso_diversity; const bool rx_with_siso_diversity;
const bool internal_wimax_coex; const bool internal_wimax_coex;
const bool iq_invert;
const bool temp_offset_v2; const bool temp_offset_v2;
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册