ath5k: Update reset code

 * Update reset and sync with HALs

 * Clean up eeprom settings and tweaking of initvals and
   put them on separate functions

 * Set/Restore 32KHz ref clk operation

 * Add some more documentation

 TODO: Spur mitigation, tpc, half/quarter rate, compression etc

 v2: Address comments from Bob and Felix and fix RSSI threshold bug
 introduced on the first version of the patch

 Signed-off-by: Nick Kossifidis <mickflemm@gmail.com>

Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 14 deletions

diff --git a/drivers/net/wireless/ath5k/attach.c b/drivers/net/wireless/ath5k/attach.c
index a3f07a4ebf4..05bc5cb44e8 100644
--- a/drivers/net/wireless/ath5k/attach.c
+++ b/drivers/net/wireless/ath5k/attach.c
@@ -169,7 +169,6 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
                 ah->ah_single_chip = false;
                 ah->ah_radio_2ghz_revision = ath5k_hw_radio_revision(ah,
                                                         CHANNEL_2GHZ);
-                ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5111;
                 break;
         case AR5K_SREV_RAD_5112:
         case AR5K_SREV_RAD_2112:
@@ -177,38 +176,31 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
                 ah->ah_single_chip = false;
                 ah->ah_radio_2ghz_revision = ath5k_hw_radio_revision(ah,
                                                         CHANNEL_2GHZ);
-                ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5112;
                 break;
         case AR5K_SREV_RAD_2413:
                 ah->ah_radio = AR5K_RF2413;
                 ah->ah_single_chip = true;
-                ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2413;
                 break;
         case AR5K_SREV_RAD_5413:
                 ah->ah_radio = AR5K_RF5413;
                 ah->ah_single_chip = true;
-                ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5413;
                 break;
         case AR5K_SREV_RAD_2316:
                 ah->ah_radio = AR5K_RF2316;
                 ah->ah_single_chip = true;
-                ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2316;
                 break;
         case AR5K_SREV_RAD_2317:
                 ah->ah_radio = AR5K_RF2317;
                 ah->ah_single_chip = true;
-                ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2317;
                 break;
         case AR5K_SREV_RAD_5424:
                 if (ah->ah_mac_version == AR5K_SREV_AR2425 ||
                 ah->ah_mac_version == AR5K_SREV_AR2417){
                         ah->ah_radio = AR5K_RF2425;
                         ah->ah_single_chip = true;
-                        ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2425;
                 } else {
                         ah->ah_radio = AR5K_RF5413;
                         ah->ah_single_chip = true;
-                        ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5413;
                 }
                 break;
         default:
@@ -227,29 +219,25 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
                         ah->ah_radio = AR5K_RF2425;
                         ah->ah_single_chip = true;
                         ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2425;
-                        ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2425;
                 } else if (srev == AR5K_SREV_AR5213A &&
-                ah->ah_phy_revision == AR5K_SREV_PHY_2112B) {
+                ah->ah_phy_revision == AR5K_SREV_PHY_5212B) {
                         ah->ah_radio = AR5K_RF5112;
                         ah->ah_single_chip = false;
-                        ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2112B;
+                        ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_5112B;
                 } else if (ah->ah_mac_version == (AR5K_SREV_AR2415 >> 4)) {
                         ah->ah_radio = AR5K_RF2316;
                         ah->ah_single_chip = true;
                         ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2316;
-                        ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2316;
                 } else if (ah->ah_mac_version == (AR5K_SREV_AR5414 >> 4) ||
                 ah->ah_phy_revision == AR5K_SREV_PHY_5413) {
                         ah->ah_radio = AR5K_RF5413;
                         ah->ah_single_chip = true;
                         ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_5413;
-                        ah->ah_phy_spending = AR5K_PHY_SPENDING_RF5413;
                 } else if (ah->ah_mac_version == (AR5K_SREV_AR2414 >> 4) ||
                 ah->ah_phy_revision == AR5K_SREV_PHY_2413) {
                         ah->ah_radio = AR5K_RF2413;
                         ah->ah_single_chip = true;
                         ah->ah_radio_5ghz_revision = AR5K_SREV_RAD_2413;
-                        ah->ah_phy_spending = AR5K_PHY_SPENDING_RF2413;
                 } else {
                         ATH5K_ERR(sc, "Couldn't identify radio revision.\n");
                         ret = -ENODEV;