Commit 9094a086 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville

ath9k_hw: remove some useless calibration data

The percal struct and bitmask for the initial DC calibration are not
used anywhere, so they can be removed.

Signed-off-by: Felix Fietkau <nbd@openwrt.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f209f529
...@@ -45,11 +45,6 @@ static void ar9002_hw_setup_calibration(struct ath_hw *ah, ...@@ -45,11 +45,6 @@ static void ar9002_hw_setup_calibration(struct ath_hw *ah,
ath_print(common, ATH_DBG_CALIBRATE, ath_print(common, ATH_DBG_CALIBRATE,
"starting ADC DC Calibration\n"); "starting ADC DC Calibration\n");
break; break;
case ADC_DC_INIT_CAL:
REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_ADC_DC_INIT);
ath_print(common, ATH_DBG_CALIBRATE,
"starting Init ADC DC Calibration\n");
break;
case TEMP_COMP_CAL: case TEMP_COMP_CAL:
break; /* Not supported */ break; /* Not supported */
} }
...@@ -950,13 +945,6 @@ static const struct ath9k_percal_data adc_dc_cal_single_sample = { ...@@ -950,13 +945,6 @@ static const struct ath9k_percal_data adc_dc_cal_single_sample = {
ar9002_hw_adc_dccal_collect, ar9002_hw_adc_dccal_collect,
ar9002_hw_adc_dccal_calibrate ar9002_hw_adc_dccal_calibrate
}; };
static const struct ath9k_percal_data adc_init_dc_cal = {
ADC_DC_INIT_CAL,
MIN_CAL_SAMPLES,
INIT_LOG_COUNT,
ar9002_hw_adc_dccal_collect,
ar9002_hw_adc_dccal_calibrate
};
static void ar9002_hw_init_cal_settings(struct ath_hw *ah) static void ar9002_hw_init_cal_settings(struct ath_hw *ah)
{ {
...@@ -973,16 +961,12 @@ static void ar9002_hw_init_cal_settings(struct ath_hw *ah) ...@@ -973,16 +961,12 @@ static void ar9002_hw_init_cal_settings(struct ath_hw *ah)
&adc_gain_cal_single_sample; &adc_gain_cal_single_sample;
ah->adcdc_caldata.calData = ah->adcdc_caldata.calData =
&adc_dc_cal_single_sample; &adc_dc_cal_single_sample;
ah->adcdc_calinitdata.calData =
&adc_init_dc_cal;
} else { } else {
ah->iq_caldata.calData = &iq_cal_multi_sample; ah->iq_caldata.calData = &iq_cal_multi_sample;
ah->adcgain_caldata.calData = ah->adcgain_caldata.calData =
&adc_gain_cal_multi_sample; &adc_gain_cal_multi_sample;
ah->adcdc_caldata.calData = ah->adcdc_caldata.calData =
&adc_dc_cal_multi_sample; &adc_dc_cal_multi_sample;
ah->adcdc_calinitdata.calData =
&adc_init_dc_cal;
} }
ah->supp_cals = ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL; ah->supp_cals = ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL;
} }
......
...@@ -50,7 +50,6 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah, ...@@ -50,7 +50,6 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah,
ath_print(common, ATH_DBG_CALIBRATE, ath_print(common, ATH_DBG_CALIBRATE,
"starting Temperature Compensation Calibration\n"); "starting Temperature Compensation Calibration\n");
break; break;
case ADC_DC_INIT_CAL:
case ADC_GAIN_CAL: case ADC_GAIN_CAL:
case ADC_DC_CAL: case ADC_DC_CAL:
/* Not yet */ /* Not yet */
......
...@@ -59,7 +59,6 @@ struct ar5416IniArray { ...@@ -59,7 +59,6 @@ struct ar5416IniArray {
} while (0) } while (0)
enum ath9k_cal_types { enum ath9k_cal_types {
ADC_DC_INIT_CAL = 0x1,
ADC_GAIN_CAL = 0x2, ADC_GAIN_CAL = 0x2,
ADC_DC_CAL = 0x4, ADC_DC_CAL = 0x4,
IQ_MISMATCH_CAL = 0x8, IQ_MISMATCH_CAL = 0x8,
......
...@@ -692,7 +692,6 @@ struct ath_hw { ...@@ -692,7 +692,6 @@ struct ath_hw {
enum ath9k_cal_types supp_cals; enum ath9k_cal_types supp_cals;
struct ath9k_cal_list iq_caldata; struct ath9k_cal_list iq_caldata;
struct ath9k_cal_list adcgain_caldata; struct ath9k_cal_list adcgain_caldata;
struct ath9k_cal_list adcdc_calinitdata;
struct ath9k_cal_list adcdc_caldata; struct ath9k_cal_list adcdc_caldata;
struct ath9k_cal_list tempCompCalData; struct ath9k_cal_list tempCompCalData;
struct ath9k_cal_list *cal_list; struct ath9k_cal_list *cal_list;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment