diff options
author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2013-01-03 01:51:23 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-01-07 15:17:00 -0500 |
commit | 1a6e5d7c96c247ee0d9f446248679cac1bd65dd1 (patch) | |
tree | 280d0604cf86755d461edf22f77e880633d35ea4 /drivers/net | |
parent | b686929c544be6d2d30b82dfb7a61a7766885177 (diff) |
ath9k_hw: Remove TEMP_COMP_CAL
This is not enabled for any chip and is unused.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_calib.c | 20 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 1 |
2 files changed, 3 insertions, 18 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c index 598b847e4e5a..a562a5d47eab 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c | |||
@@ -32,7 +32,6 @@ struct coeff { | |||
32 | 32 | ||
33 | enum ar9003_cal_types { | 33 | enum ar9003_cal_types { |
34 | IQ_MISMATCH_CAL = BIT(0), | 34 | IQ_MISMATCH_CAL = BIT(0), |
35 | TEMP_COMP_CAL = BIT(1), | ||
36 | }; | 35 | }; |
37 | 36 | ||
38 | static void ar9003_hw_setup_calibration(struct ath_hw *ah, | 37 | static void ar9003_hw_setup_calibration(struct ath_hw *ah, |
@@ -49,7 +48,7 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah, | |||
49 | */ | 48 | */ |
50 | REG_RMW_FIELD(ah, AR_PHY_TIMING4, | 49 | REG_RMW_FIELD(ah, AR_PHY_TIMING4, |
51 | AR_PHY_TIMING4_IQCAL_LOG_COUNT_MAX, | 50 | AR_PHY_TIMING4_IQCAL_LOG_COUNT_MAX, |
52 | currCal->calData->calCountMax); | 51 | currCal->calData->calCountMax); |
53 | REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_IQ); | 52 | REG_WRITE(ah, AR_PHY_CALMODE, AR_PHY_CALMODE_IQ); |
54 | 53 | ||
55 | ath_dbg(common, CALIBRATE, | 54 | ath_dbg(common, CALIBRATE, |
@@ -58,14 +57,8 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah, | |||
58 | /* Kick-off cal */ | 57 | /* Kick-off cal */ |
59 | REG_SET_BIT(ah, AR_PHY_TIMING4, AR_PHY_TIMING4_DO_CAL); | 58 | REG_SET_BIT(ah, AR_PHY_TIMING4, AR_PHY_TIMING4_DO_CAL); |
60 | break; | 59 | break; |
61 | case TEMP_COMP_CAL: | 60 | default: |
62 | REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_THERM, | 61 | ath_err(common, "Invalid calibration type\n"); |
63 | AR_PHY_65NM_CH0_THERM_LOCAL, 1); | ||
64 | REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_THERM, | ||
65 | AR_PHY_65NM_CH0_THERM_START, 1); | ||
66 | |||
67 | ath_dbg(common, CALIBRATE, | ||
68 | "starting Temperature Compensation Calibration\n"); | ||
69 | break; | 62 | break; |
70 | } | 63 | } |
71 | } | 64 | } |
@@ -1144,13 +1137,6 @@ skip_tx_iqcal: | |||
1144 | INSERT_CAL(ah, &ah->iq_caldata); | 1137 | INSERT_CAL(ah, &ah->iq_caldata); |
1145 | ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n"); | 1138 | ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n"); |
1146 | 1139 | ||
1147 | if (ah->supp_cals & TEMP_COMP_CAL) { | ||
1148 | INIT_CAL(&ah->tempCompCalData); | ||
1149 | INSERT_CAL(ah, &ah->tempCompCalData); | ||
1150 | ath_dbg(common, CALIBRATE, | ||
1151 | "enabling Temperature Compensation Calibration\n"); | ||
1152 | } | ||
1153 | |||
1154 | /* Initialize current pointer to first element in list */ | 1140 | /* Initialize current pointer to first element in list */ |
1155 | ah->cal_list_curr = ah->cal_list; | 1141 | ah->cal_list_curr = ah->cal_list; |
1156 | 1142 | ||
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index d2b5229474b6..38c5a8702fb2 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -768,7 +768,6 @@ struct ath_hw { | |||
768 | struct ath9k_cal_list iq_caldata; | 768 | struct ath9k_cal_list iq_caldata; |
769 | struct ath9k_cal_list adcgain_caldata; | 769 | struct ath9k_cal_list adcgain_caldata; |
770 | struct ath9k_cal_list adcdc_caldata; | 770 | struct ath9k_cal_list adcdc_caldata; |
771 | struct ath9k_cal_list tempCompCalData; | ||
772 | struct ath9k_cal_list *cal_list; | 771 | struct ath9k_cal_list *cal_list; |
773 | struct ath9k_cal_list *cal_list_last; | 772 | struct ath9k_cal_list *cal_list_last; |
774 | struct ath9k_cal_list *cal_list_curr; | 773 | struct ath9k_cal_list *cal_list_curr; |