carl9170 firmware: update shared headers

 * add SET_CONSTVAL helper

 * cosmetic changes

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/include/shared/hw.h b/include/shared/hw.h
index b1292ac5b7033f4704d96bc691226ce4ebfe4efb..2f471b3f05afdec737ab6e1d293ac40bb7c0db5c 100644 (file)
--- a/include/shared/hw.h
+++ b/include/shared/hw.h
@@ -731,6 +731,9 @@ struct ar9170_stream {
 #define SET_VAL(reg, value, newvalue)                                  \
        (value = ((value) & ~reg) | (((newvalue) << reg##_S) & reg))
 
+#define SET_CONSTVAL(reg, newvalue)                                    \
+       (((newvalue) << reg##_S) & reg)
+
 #define MOD_VAL(reg, value, newvalue)                                  \
        (((value) & ~reg) | (((newvalue) << reg##_S) & reg))
 #endif /* __CARL9170_SHARED_HW_H */

diff --git a/include/shared/phy.h b/include/shared/phy.h
index 53c18d34ffccb6ba1e4aab146feecea372e9f97e..02c34eb4ebdec5fe64eb0730e24e89393c8f800f 100644 (file)
--- a/include/shared/phy.h
+++ b/include/shared/phy.h
@@ -423,8 +423,8 @@
 #define                AR9170_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV    0x2000
 #define                AR9170_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV_S  13
 
-#define        AR9170_PHY_REG_GAIN_2GHZ_CHAIN_2        (AR9170_PHY_REG_BASE + 0x2a0c)
 #define        AR9170_PHY_REG_GAIN_2GHZ                (AR9170_PHY_REG_BASE + 0x0a0c)
+#define        AR9170_PHY_REG_GAIN_2GHZ_CHAIN_2        (AR9170_PHY_REG_BASE + 0x2a0c)
 #define                AR9170_PHY_GAIN_2GHZ_RXTX_MARGIN        0x00fc0000
 #define                AR9170_PHY_GAIN_2GHZ_RXTX_MARGIN_S      18
 #define                AR9170_PHY_GAIN_2GHZ_BSW_MARGIN         0x00003c00
@@ -561,7 +561,4 @@
 #define                AR9170_PHY_CH2_EXT_MINCCA_PWR           0xff800000
 #define                AR9170_PHY_CH2_EXT_MINCCA_PWR_S         23
 
-#define        REDUCE_CHAIN_0 0x00000050
-#define        REDUCE_CHAIN_1 0x00000051
-
 #endif /* __CARL9170_SHARED_PHY_H */