diff options
author | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-16 14:10:39 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-12-16 14:10:39 -0500 |
commit | 7e95e365d5399647a41e10059e4b09826b82d78b (patch) | |
tree | 305c9968798adae3d9484657339fa39d2a5fdaac /drivers/net/wireless/ath/ath9k/ar9003_phy.h | |
parent | 3ca9d1fc9aa64077645a26c396de9399b49ea226 (diff) | |
parent | 5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f (diff) |
Merge remote branch 'wireless-next/master' into ath6kl-next
Conflicts:
drivers/net/wireless/ath/ath6kl/init.c
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_phy.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_phy.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h index 497d7461838a..ed64114571fc 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h | |||
@@ -490,6 +490,8 @@ | |||
490 | #define AR_PHY_TEST_CTL_TSTADC_EN_S 8 | 490 | #define AR_PHY_TEST_CTL_TSTADC_EN_S 8 |
491 | #define AR_PHY_TEST_CTL_RX_OBS_SEL 0x3C00 | 491 | #define AR_PHY_TEST_CTL_RX_OBS_SEL 0x3C00 |
492 | #define AR_PHY_TEST_CTL_RX_OBS_SEL_S 10 | 492 | #define AR_PHY_TEST_CTL_RX_OBS_SEL_S 10 |
493 | #define AR_PHY_TEST_CTL_DEBUGPORT_SEL 0xe0000000 | ||
494 | #define AR_PHY_TEST_CTL_DEBUGPORT_SEL_S 29 | ||
493 | 495 | ||
494 | 496 | ||
495 | #define AR_PHY_TSTDAC (AR_SM_BASE + 0x168) | 497 | #define AR_PHY_TSTDAC (AR_SM_BASE + 0x168) |
@@ -1001,6 +1003,7 @@ | |||
1001 | 1003 | ||
1002 | /* GLB Registers */ | 1004 | /* GLB Registers */ |
1003 | #define AR_GLB_BASE 0x20000 | 1005 | #define AR_GLB_BASE 0x20000 |
1006 | #define AR_GLB_GPIO_CONTROL (AR_GLB_BASE) | ||
1004 | #define AR_PHY_GLB_CONTROL (AR_GLB_BASE + 0x44) | 1007 | #define AR_PHY_GLB_CONTROL (AR_GLB_BASE + 0x44) |
1005 | #define AR_GLB_SCRATCH(_ah) (AR_GLB_BASE + \ | 1008 | #define AR_GLB_SCRATCH(_ah) (AR_GLB_BASE + \ |
1006 | (AR_SREV_9462_20(_ah) ? 0x4c : 0x50)) | 1009 | (AR_SREV_9462_20(_ah) ? 0x4c : 0x50)) |