| From 620a55687b20c23ca7b8d8560b0e8fb3ca13869a Mon Sep 17 00:00:00 2001 |
| From: Zefir Kurtisi <zefir.kurtisi@neratec.com> |
| Date: Wed, 23 May 2012 13:34:31 +0200 |
| Subject: [PATCH 04/57] ath9k: fix/add bits for spectral scanning |
| |
| Updates for spectral scanning register modification for AR93x: |
| * fix bits for spectral_scan_count |
| * add bits for new parameters |
| |
| Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com> |
| Signed-off-by: John W. Linville <linville@tuxdriver.com> |
| --- |
| drivers/net/wireless/ath/ath9k/ar9003_phy.h | 32 +++++++++++++++++---------- |
| 1 file changed, 20 insertions(+), 12 deletions(-) |
| |
| --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h |
| +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h |
| @@ -820,18 +820,26 @@ |
| #define AR_PHY_CHAN_INFO_MEMORY_CAPTURE_MASK 0x0001 |
| #define AR_PHY_RX_DELAY_DELAY 0x00003FFF |
| #define AR_PHY_CCK_TX_CTRL_JAPAN 0x00000010 |
| -#define AR_PHY_SPECTRAL_SCAN_ENABLE 0x00000001 |
| -#define AR_PHY_SPECTRAL_SCAN_ENABLE_S 0 |
| -#define AR_PHY_SPECTRAL_SCAN_ACTIVE 0x00000002 |
| -#define AR_PHY_SPECTRAL_SCAN_ACTIVE_S 1 |
| -#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD 0x000000F0 |
| -#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD_S 4 |
| -#define AR_PHY_SPECTRAL_SCAN_PERIOD 0x0000FF00 |
| -#define AR_PHY_SPECTRAL_SCAN_PERIOD_S 8 |
| -#define AR_PHY_SPECTRAL_SCAN_COUNT 0x00FF0000 |
| -#define AR_PHY_SPECTRAL_SCAN_COUNT_S 16 |
| -#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT 0x01000000 |
| -#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S 24 |
| + |
| +#define AR_PHY_SPECTRAL_SCAN_ENABLE 0x00000001 |
| +#define AR_PHY_SPECTRAL_SCAN_ENABLE_S 0 |
| +#define AR_PHY_SPECTRAL_SCAN_ACTIVE 0x00000002 |
| +#define AR_PHY_SPECTRAL_SCAN_ACTIVE_S 1 |
| +#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD 0x000000F0 |
| +#define AR_PHY_SPECTRAL_SCAN_FFT_PERIOD_S 4 |
| +#define AR_PHY_SPECTRAL_SCAN_PERIOD 0x0000FF00 |
| +#define AR_PHY_SPECTRAL_SCAN_PERIOD_S 8 |
| +#define AR_PHY_SPECTRAL_SCAN_COUNT 0x0FFF0000 |
| +#define AR_PHY_SPECTRAL_SCAN_COUNT_S 16 |
| +#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT 0x10000000 |
| +#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S 28 |
| +#define AR_PHY_SPECTRAL_SCAN_PRIORITY 0x20000000 |
| +#define AR_PHY_SPECTRAL_SCAN_PRIORITY_S 29 |
| +#define AR_PHY_SPECTRAL_SCAN_USE_ERR5 0x40000000 |
| +#define AR_PHY_SPECTRAL_SCAN_USE_ERR5_S 30 |
| +#define AR_PHY_SPECTRAL_SCAN_COMPRESSED_RPT 0x80000000 |
| +#define AR_PHY_SPECTRAL_SCAN_COMPRESSED_RPT_S 31 |
| + |
| #define AR_PHY_CHANNEL_STATUS_RX_CLEAR 0x00000004 |
| #define AR_PHY_RTT_CTRL_ENA_RADIO_RETENTION 0x00000001 |
| #define AR_PHY_RTT_CTRL_ENA_RADIO_RETENTION_S 0 |