ath9k_hw: define registers/macros to support Antenna diversity

define few registers and macros to configure/enable Antenna diversity
parameters in AR9485

Cc: Gabriel Tseng <Gabriel.Tseng@Atheros.com>
Cc: Senthilkumar Balasubramanian <Senthilkumar.Balasubramanian@Atheros.com>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index 2a0d5cbb7e76b8aadd5074581962d23fe0a475f1..c7505b48e5c0b3ede5ff22de98f0f2edd1afc7b5 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -261,12 +261,34 @@
 #define AR_PHY_EXT_CCA0         (AR_AGC_BASE + 0x20)
 #define AR_PHY_RESTART          (AR_AGC_BASE + 0x24)
 
+/*
+ * Antenna Diversity  settings
+ */
 #define AR_PHY_MC_GAIN_CTRL     (AR_AGC_BASE + 0x28)
 #define AR_ANT_DIV_CTRL_ALL    0x7e000000
 #define AR_ANT_DIV_CTRL_ALL_S  25
 #define AR_ANT_DIV_ENABLE      0x1000000
 #define AR_ANT_DIV_ENABLE_S    24
 
+
+#define AR_PHY_9485_ANT_FAST_DIV_BIAS                  0x00007e00
+#define AR_PHY_9485_ANT_FAST_DIV_BIAS_S                  9
+#define AR_PHY_9485_ANT_DIV_LNADIV                     0x01000000
+#define AR_PHY_9485_ANT_DIV_LNADIV_S                   24
+#define AR_PHY_9485_ANT_DIV_ALT_LNACONF                        0x06000000
+#define AR_PHY_9485_ANT_DIV_ALT_LNACONF_S              25
+#define AR_PHY_9485_ANT_DIV_MAIN_LNACONF               0x18000000
+#define AR_PHY_9485_ANT_DIV_MAIN_LNACONF_S             27
+#define AR_PHY_9485_ANT_DIV_ALT_GAINTB                 0x20000000
+#define AR_PHY_9485_ANT_DIV_ALT_GAINTB_S               29
+#define AR_PHY_9485_ANT_DIV_MAIN_GAINTB                        0x40000000
+#define AR_PHY_9485_ANT_DIV_MAIN_GAINTB_S              30
+
+#define AR_PHY_9485_ANT_DIV_LNA1_MINUS_LNA2            0x0
+#define AR_PHY_9485_ANT_DIV_LNA2                       0x1
+#define AR_PHY_9485_ANT_DIV_LNA1                       0x2
+#define AR_PHY_9485_ANT_DIV_LNA1_PLUS_LNA2             0x3
+
 #define AR_PHY_EXTCHN_PWRTHR1   (AR_AGC_BASE + 0x2c)
 #define AR_PHY_EXT_CHN_WIN      (AR_AGC_BASE + 0x30)
 #define AR_PHY_20_40_DET_THR    (AR_AGC_BASE + 0x34)

diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 67cca10bf4c9b3b97fa334f3677e9cf901a7f6dd..80f512d1f9750b9d4b1e3cbd7340525c2322a346 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -479,6 +479,9 @@ struct ath_hw_antcomb_conf {
        u8 main_lna_conf;
        u8 alt_lna_conf;
        u8 fast_div_bias;
+       u8 main_gaintb;
+       u8 alt_gaintb;
+       int lna1_lna2_delta;
 };
 
 /**