diff options
author | Abhijeet Kolekar <abhijeet.kolekar@intel.com> | 2010-01-22 17:22:47 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-25 16:36:21 -0500 |
commit | 07f33f92e8e1e6ed2ec9d4de048142e7a1d96856 (patch) | |
tree | f92d1b98c802ff30e64875b78aa81a10767bdea8 /drivers/net/wireless/iwlwifi/iwl-6000.c | |
parent | 3e4fb5faefb57824f2e42305b3d5907845af978c (diff) |
iwlwifi: enable DC calibration
From: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
For 6X50 DC calibration needs to be initialized
else uCode will run an endless loop.
Enbale DC calibration in hw config.
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index b191c634ad92..f89ef4aa78fd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -158,11 +158,25 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) | |||
158 | /* Set initial sensitivity parameters */ | 158 | /* Set initial sensitivity parameters */ |
159 | /* Set initial calibration set */ | 159 | /* Set initial calibration set */ |
160 | priv->hw_params.sens = &iwl6000_sensitivity; | 160 | priv->hw_params.sens = &iwl6000_sensitivity; |
161 | priv->hw_params.calib_init_cfg = | 161 | switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) { |
162 | case CSR_HW_REV_TYPE_6x50: | ||
163 | priv->hw_params.calib_init_cfg = | ||
162 | BIT(IWL_CALIB_XTAL) | | 164 | BIT(IWL_CALIB_XTAL) | |
165 | BIT(IWL_CALIB_DC) | | ||
163 | BIT(IWL_CALIB_LO) | | 166 | BIT(IWL_CALIB_LO) | |
164 | BIT(IWL_CALIB_TX_IQ) | | 167 | BIT(IWL_CALIB_TX_IQ) | |
165 | BIT(IWL_CALIB_BASE_BAND); | 168 | BIT(IWL_CALIB_BASE_BAND); |
169 | |||
170 | break; | ||
171 | default: | ||
172 | priv->hw_params.calib_init_cfg = | ||
173 | BIT(IWL_CALIB_XTAL) | | ||
174 | BIT(IWL_CALIB_LO) | | ||
175 | BIT(IWL_CALIB_TX_IQ) | | ||
176 | BIT(IWL_CALIB_BASE_BAND); | ||
177 | break; | ||
178 | } | ||
179 | |||
166 | return 0; | 180 | return 0; |
167 | } | 181 | } |
168 | 182 | ||