diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-06-15 19:14:53 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-06-25 17:52:18 -0400 |
commit | 178d1596073e81927a24221dba6c55ae0048a207 (patch) | |
tree | c8783d2f8bb153f14359da99eb35f4e310c4bd8d /drivers/net/wireless/iwlwifi/iwl-5000.c | |
parent | 4e3243f549540235d180e446715a14c1b5827902 (diff) |
iwlwifi: enable DC calibration based on config parameter
Different devices have different calibration requirement,
some need DC calibration and some don't; make it a cfg parameter
for easy management.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index c6ccc25d6c13..fa2dbb56177c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -249,10 +249,11 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) | |||
249 | /* Set initial calibration set */ | 249 | /* Set initial calibration set */ |
250 | priv->hw_params.sens = &iwl5150_sensitivity; | 250 | priv->hw_params.sens = &iwl5150_sensitivity; |
251 | priv->hw_params.calib_init_cfg = | 251 | priv->hw_params.calib_init_cfg = |
252 | BIT(IWL_CALIB_DC) | | ||
253 | BIT(IWL_CALIB_LO) | | 252 | BIT(IWL_CALIB_LO) | |
254 | BIT(IWL_CALIB_TX_IQ) | | 253 | BIT(IWL_CALIB_TX_IQ) | |
255 | BIT(IWL_CALIB_BASE_BAND); | 254 | BIT(IWL_CALIB_BASE_BAND); |
255 | if (priv->cfg->need_dc_calib) | ||
256 | priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_DC); | ||
256 | 257 | ||
257 | priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS; | 258 | priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS; |
258 | 259 | ||
@@ -660,6 +661,7 @@ struct iwl_cfg iwl5150_agn_cfg = { | |||
660 | .ucode_tracing = true, | 661 | .ucode_tracing = true, |
661 | .sensitivity_calib_by_driver = true, | 662 | .sensitivity_calib_by_driver = true, |
662 | .chain_noise_calib_by_driver = true, | 663 | .chain_noise_calib_by_driver = true, |
664 | .need_dc_calib = true, | ||
663 | }; | 665 | }; |
664 | 666 | ||
665 | struct iwl_cfg iwl5150_abg_cfg = { | 667 | struct iwl_cfg iwl5150_abg_cfg = { |
@@ -689,6 +691,7 @@ struct iwl_cfg iwl5150_abg_cfg = { | |||
689 | .ucode_tracing = true, | 691 | .ucode_tracing = true, |
690 | .sensitivity_calib_by_driver = true, | 692 | .sensitivity_calib_by_driver = true, |
691 | .chain_noise_calib_by_driver = true, | 693 | .chain_noise_calib_by_driver = true, |
694 | .need_dc_calib = true, | ||
692 | }; | 695 | }; |
693 | 696 | ||
694 | MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); | 697 | MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX)); |