ath9k: Add version/revision macros for QCA9531
PATCH v2 1/5 ath9k: Add version/revision macros for QCA9531
From: Sujith Manoharan <[email protected]>
Signed-off-by Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/reg.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/reg.h +12 -1
@@ -813,6 +813,9 @@#define AR_SREV_REVISION_9565_101 1#define AR_SREV_REVISION_9565_11 2#define AR_SREV_VERSION_9550 0x400 +#define AR_SREV_VERSION_9531 0x500 +#define AR_SREV_REVISION_9531_10 0 +#define AR_SREV_REVISION_9531_11 1#define AR_SREV_5416 (_ah) \ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \
@@ -946,11 +949,19 @@#define AR_SREV_9580 (_ah) \ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9580) && \ ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9580_10)) -#define AR_SREV_9580_10 (_ah) \ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9580) && \ ((_ah)->hw_version.macRev == AR_SREV_REVISION_9580_10)) +#define AR_SREV_9531 (_ah) \ + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531)) +#define AR_SREV_9531_10 (_ah) \ + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531) && \ + ((_ah)->hw_version.macRev == AR_SREV_REVISION_9531_10)) +#define AR_SREV_9531_11 (_ah) \ + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531) && \ + ((_ah)->hw_version.macRev == AR_SREV_REVISION_9531_11)) +/* NOTE: When adding chips newer than Peacock, add chip check here */ #define AR_SREV_9580_10_OR_LATER (_ah) \ (AR_SREV_9580(_ah))
Signature · 1 line
1.8.5.2
PATCH v2 1/5 ath9k: Add version/revision macros for QCA9531
Hi,
All the pending patches for ath9k are here:
http://msujith.org/dir/patches/wl/Dec-31-2013/
Sujith
Quoted 49 lines · Sujith Manoharan
From: Sujith Manoharan <[email protected]>
Signed-off-by Sujith Manoharan <[email protected]>--- drivers/net/wireless/ath/ath9k/reg.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)drivers/net/wireless/ath/ath9k/reg.h +12
-1@@ -813,6 +813,9 @@#define AR_SREV_REVISION_9565_101 1#define AR_SREV_REVISION_9565_11 2#define AR_SREV_VERSION_9550 0x400 +#define AR_SREV_VERSION_9531 0x500 +#define AR_SREV_REVISION_9531_10 0 +#define AR_SREV_REVISION_9531_11 1#define AR_SREV_5416 (_ah) \ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \@@ -946,11 +949,19 @@#define AR_SREV_9580 (_ah) \ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9580) && \ ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9580_10)) -#define AR_SREV_9580_10 (_ah) \ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9580) && \ ((_ah)->hw_version.macRev == AR_SREV_REVISION_9580_10)) +#define AR_SREV_9531 (_ah) \ + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531)) +#define AR_SREV_9531_10 (_ah) \ + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531) && \ + ((_ah)->hw_version.macRev == AR_SREV_REVISION_9531_10)) +#define AR_SREV_9531_11 (_ah) \ + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9531) && \ + ((_ah)->hw_version.macRev == AR_SREV_REVISION_9531_11)) +/* NOTE: When adding chips newer than Peacock, add chip check here */ #define AR_SREV_9580_10_OR_LATER (_ah) \ (AR_SREV_9580(_ah))Signature · 6 lines
1.8.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 2/5 ath9k: Assign macVersion for QCA9531
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Signed-off-by Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/hw.c | 5 +++++ drivers/net/wireless/ath/ath9k/hw.h | 1 + 2 files changed, 6 insertions(+)
drivers/net/wireless/ath/ath9k/hw.c +5 -0
@@ -245,6 +245,9 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)case AR9300_DEVID_QCA955X : ah->hw_version.macVersion =AR_SREV_VERSION_9550 ;return ; +case AR9300_DEVID_AR953X : + ah->hw_version.macVersion =AR_SREV_VERSION_9531 ; +return ; } val =REG_READ (ah,AR_SREV ) &AR_SREV_ID ;
@@ -518,6 +521,7 @@ static int __ath9k_hw_init(struct ath_hw *ah)case AR_SREV_VERSION_9462 :case AR_SREV_VERSION_9550 :case AR_SREV_VERSION_9565 : +case AR_SREV_VERSION_9531 :break ;default : ath_err(common,
@@ -617,6 +621,7 @@ int ath9k_hw_init(struct ath_hw *ah)case AR9300_DEVID_AR9462 :case AR9485_DEVID_AR1111 :case AR9300_DEVID_AR9565 : +case AR9300_DEVID_AR953X :break ;default :if (common->bus_ops->ath_bus_type ==ATH_USB )
drivers/net/wireless/ath/ath9k/hw.h +1 -0
@@ -52,6 +52,7 @@#define AR9300_DEVID_QCA955X 0x0038#define AR9485_DEVID_AR1111 0x0037#define AR9300_DEVID_AR9565 0x0036 +#define AR9300_DEVID_AR953X 0x003d#define AR5416_AR9100_DEVID 0x000b
Signature · 1 line
1.8.5.2
PATCH v2 3/5 ath9k: Add QCA953x initvals
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Signed-off-by Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 718 +++++++++++++++++++++++ 1 file changed, 718 insertions(+) create mode 100644 drivers/net/wireless/ath/ath9k/ar953x_initvals.h
drivers/net/wireless/ath/ath9k/ar953x_initvals.h new file +718 -0
@@ -0,0 +1,718 @@ +/* +* Copyright (c) 2010-2011 Atheros Communications Inc. +* Copyright (c) 2011-2012 Qualcomm Atheros Inc. +* +* Permission to use, copy, modify, and/or distribute this software for any +* purpose with or without fee is hereby granted, provided that the above +* copyright notice and this permission notice appear in all copies. +* +* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#ifndef INITVALS_953X_H +#define INITVALS_953X_H + +#define qca953x_1p0_mac_postamble ar9300_2p2_mac_postamble + +#define qca953x_1p0_soc_postamble ar9300_2p2_soc_postamble + +#define qca953x_1p0_common_rx_gain_table ar9300Common_rx_gain_table_2p2 + +#define qca953x_1p0_common_wo_xlna_rx_gain_table ar9300Common_wo_xlna_rx_gain_table_2p2 + +#define qca953x_1p0_modes_fast_clock ar9300Modes_fast_clock_2p2 + +static const u32 qca953x_1p0_mac_core[][2 ] = { +/* Addr allmodes */ + {0x00000008 ,0x00000000 }, + {0x00000030 ,0x00020085 }, + {0x00000034 ,0x00000005 }, + {0x00000040 ,0x00000000 }, + {0x00000044 ,0x00000000 }, + {0x00000048 ,0x00000008 }, + {0x0000004c ,0x00000010 }, + {0x00000050 ,0x00000000 }, + {0x00001040 ,0x002ffc0f }, + {0x00001044 ,0x002ffc0f }, + {0x00001048 ,0x002ffc0f }, + {0x0000104c ,0x002ffc0f }, + {0x00001050 ,0x002ffc0f }, + {0x00001054 ,0x002ffc0f }, + {0x00001058 ,0x002ffc0f }, + {0x0000105c ,0x002ffc0f }, + {0x00001060 ,0x002ffc0f }, + {0x00001064 ,0x002ffc0f }, + {0x000010f0 ,0x00000100 }, + {0x00001270 ,0x00000000 }, + {0x000012b0 ,0x00000000 }, + {0x000012f0 ,0x00000000 }, + {0x0000143c ,0x00000000 }, + {0x0000147c ,0x00000000 }, + {0x00008000 ,0x00000000 }, + {0x00008004 ,0x00000000 }, + {0x00008008 ,0x00000000 }, + {0x0000800c ,0x00000000 }, + {0x00008018 ,0x00000000 }, + {0x00008020 ,0x00000000 }, + {0x00008038 ,0x00000000 }, + {0x0000803c ,0x00000000 }, + {0x00008040 ,0x00000000 }, + {0x00008044 ,0x00000000 }, + {0x00008048 ,0x00000000 }, + {0x0000804c ,0xffffffff }, + {0x00008054 ,0x00000000 }, + {0x00008058 ,0x00000000 }, + {0x0000805c ,0x000fc78f }, + {0x00008060 ,0x0000000f }, + {0x00008064 ,0x00000000 }, + {0x00008070 ,0x00000310 }, + {0x00008074 ,0x00000020 }, + {0x00008078 ,0x00000000 }, + {0x0000809c ,0x0000000f }, + {0x000080a0 ,0x00000000 }, + {0x000080a4 ,0x02ff0000 }, + {0x000080a8 ,0x0e070605 }, + {0x000080ac ,0x0000000d }, + {0x000080b0 ,0x00000000 }, + {0x000080b4 ,0x00000000 }, + {0x000080b8 ,0x00000000 }, + {0x000080bc ,0x00000000 }, + {0x000080c0 ,0x2a800000 }, + {0x000080c4 ,0x06900168 }, + {0x000080c8 ,0x13881c22 }, + {0x000080cc ,0x01f40000 }, + {0x000080d0 ,0x00252500 }, + {0x000080d4 ,0x00a00000 }, + {0x000080d8 ,0x00400000 }, + {0x000080dc ,0x00000000 }, + {0x000080e0 ,0xffffffff }, + {0x000080e4 ,0x0000ffff }, + {0x000080e8 ,0x3f3f3f3f }, + {0x000080ec ,0x00000000 }, + {0x000080f0 ,0x00000000 }, + {0x000080f4 ,0x00000000 }, + {0x000080fc ,0x00020000 }, + {0x00008100 ,0x00000000 }, + {0x00008108 ,0x00000052 }, + {0x0000810c ,0x00000000 }, + {0x00008110 ,0x00000000 }, + {0x00008114 ,0x000007ff }, + {0x00008118 ,0x000000aa }, + {0x0000811c ,0x00003210 }, + {0x00008124 ,0x00000000 }, + {0x00008128 ,0x00000000 }, + {0x0000812c ,0x00000000 }, + {0x00008130 ,0x00000000 }, + {0x00008134 ,0x00000000 }, + {0x00008138 ,0x00000000 }, + {0x0000813c ,0x0000ffff }, + {0x00008140 ,0x000000fe }, + {0x00008144 ,0xffffffff }, + {0x00008168 ,0x00000000 }, + {0x0000816c ,0x00000000 }, + {0x000081c0 ,0x00000000 }, + {0x000081c4 ,0x33332210 }, + {0x000081ec ,0x00000000 }, + {0x000081f0 ,0x00000000 }, + {0x000081f4 ,0x00000000 }, + {0x000081f8 ,0x00000000 }, + {0x000081fc ,0x00000000 }, + {0x00008240 ,0x00100000 }, + {0x00008244 ,0x0010f3d7 }, + {0x00008248 ,0x00000852 }, + {0x0000824c ,0x0001e7ae }, + {0x00008250 ,0x00000000 }, + {0x00008254 ,0x00000000 }, + {0x00008258 ,0x00000000 }, + {0x0000825c ,0x40000000 }, + {0x00008260 ,0x00080922 }, + {0x00008264 ,0x9d400010 }, + {0x00008268 ,0xffffffff }, + {0x0000826c ,0x0000ffff }, + {0x00008270 ,0x00000000 }, + {0x00008274 ,0x40000000 }, + {0x00008278 ,0x003e4180 }, + {0x0000827c ,0x00000004 }, + {0x00008284 ,0x0000002c }, + {0x00008288 ,0x0000002c }, + {0x0000828c ,0x000000ff }, + {0x00008294 ,0x00000000 }, + {0x00008298 ,0x00000000 }, + {0x0000829c ,0x00000000 }, + {0x00008300 ,0x00001d40 }, + {0x00008314 ,0x00000000 }, + {0x0000831c ,0x0000010d }, + {0x00008328 ,0x00000000 }, + {0x0000832c ,0x0000001f }, + {0x00008330 ,0x00000302 }, + {0x00008334 ,0x00000700 }, + {0x00008338 ,0xffff0000 }, + {0x0000833c ,0x02400000 }, + {0x00008340 ,0x000107ff }, + {0x00008344 ,0xaa48107b }, + {0x00008348 ,0x008f0000 }, + {0x0000835c ,0x00000000 }, + {0x00008360 ,0xffffffff }, + {0x00008364 ,0xffffffff }, + {0x00008368 ,0x00000000 }, + {0x00008370 ,0x00000000 }, + {0x00008374 ,0x000000ff }, + {0x00008378 ,0x00000000 }, + {0x0000837c ,0x00000000 }, + {0x00008380 ,0xffffffff }, + {0x00008384 ,0xffffffff }, + {0x00008390 ,0xffffffff }, + {0x00008394 ,0xffffffff }, + {0x00008398 ,0x00000000 }, + {0x0000839c ,0x00000000 }, + {0x000083a0 ,0x00000000 }, + {0x000083a4 ,0x0000fa14 }, + {0x000083a8 ,0x000f0c00 }, + {0x000083ac ,0x33332210 }, + {0x000083b0 ,0x33332210 }, + {0x000083b4 ,0x33332210 }, + {0x000083b8 ,0x33332210 }, + {0x000083bc ,0x00000000 }, + {0x000083c0 ,0x00000000 }, + {0x000083c4 ,0x00000000 }, + {0x000083c8 ,0x00000000 }, + {0x000083cc ,0x00000200 }, + {0x000083d0 ,0x8c7901ff }, +}; + +static const u32 qca953x_1p0_baseband_core[][2 ] = { +/* Addr allmodes */ + {0x00009800 ,0xafe68e30 }, + {0x00009804 ,0xfd14e000 }, + {0x00009808 ,0x9c0a9f6b }, + {0x0000980c ,0x04900000 }, + {0x00009814 ,0x0280c00a }, + {0x00009818 ,0x00000000 }, + {0x0000981c ,0x00020028 }, + {0x00009834 ,0x6400a190 }, + {0x00009838 ,0x0108ecff }, + {0x0000983c ,0x14000600 }, + {0x00009880 ,0x201fff00 }, + {0x00009884 ,0x00001042 }, + {0x000098a4 ,0x00200400 }, + {0x000098b0 ,0x32840bbe }, + {0x000098bc ,0x00000002 }, + {0x000098d0 ,0x004b6a8e }, + {0x000098d4 ,0x00000820 }, + {0x000098dc ,0x00000000 }, + {0x000098f0 ,0x00000000 }, + {0x000098f4 ,0x00000000 }, + {0x00009c04 ,0xff55ff55 }, + {0x00009c08 ,0x0320ff55 }, + {0x00009c0c ,0x00000000 }, + {0x00009c10 ,0x00000000 }, + {0x00009c14 ,0x00046384 }, + {0x00009c18 ,0x05b6b440 }, + {0x00009c1c ,0x00b6b440 }, + {0x00009d00 ,0xc080a333 }, + {0x00009d04 ,0x40206c10 }, + {0x00009d08 ,0x009c4060 }, + {0x00009d0c ,0x9883800a }, + {0x00009d10 ,0x01884061 }, + {0x00009d14 ,0x00c0040b }, + {0x00009d18 ,0x00000000 }, + {0x00009e08 ,0x0038230c }, + {0x00009e24 ,0x990bb515 }, + {0x00009e28 ,0x0c6f0000 }, + {0x00009e30 ,0x06336f77 }, + {0x00009e34 ,0x6af6532f }, + {0x00009e38 ,0x0cc80c00 }, + {0x00009e40 ,0x0d261820 }, + {0x00009e4c ,0x00001004 }, + {0x00009e50 ,0x00ff03f1 }, + {0x00009fc0 ,0x813e4788 }, + {0x00009fc4 ,0x0001efb5 }, + {0x00009fcc ,0x40000014 }, + {0x00009fd0 ,0x01193b91 }, + {0x0000a20c ,0x00000000 }, + {0x0000a220 ,0x00000000 }, + {0x0000a224 ,0x00000000 }, + {0x0000a228 ,0x10002310 }, + {0x0000a23c ,0x00000000 }, + {0x0000a244 ,0x0c000000 }, + {0x0000a248 ,0x00000140 }, + {0x0000a2a0 ,0x00000007 }, + {0x0000a2c0 ,0x00000007 }, + {0x0000a2c8 ,0x00000000 }, + {0x0000a2d4 ,0x00000000 }, + {0x0000a2ec ,0x00000000 }, + {0x0000a2f0 ,0x00000000 }, + {0x0000a2f4 ,0x00000000 }, + {0x0000a2f8 ,0x00000000 }, + {0x0000a344 ,0x00000000 }, + {0x0000a34c ,0x00000000 }, + {0x0000a350 ,0x0000a000 }, + {0x0000a364 ,0x00000000 }, + {0x0000a370 ,0x00000000 }, + {0x0000a390 ,0x00000001 }, + {0x0000a394 ,0x00000444 }, + {0x0000a398 ,0x1f020503 }, + {0x0000a39c ,0x29180c03 }, + {0x0000a3a0 ,0x9a8b6844 }, + {0x0000a3a4 ,0x000000ff }, + {0x0000a3a8 ,0x6a6a6a6a }, + {0x0000a3ac ,0x6a6a6a6a }, + {0x0000a3b0 ,0x00c8641a }, + {0x0000a3b4 ,0x0000001a }, + {0x0000a3b8 ,0x0088642a }, + {0x0000a3bc ,0x000001fa }, + {0x0000a3c0 ,0x20202020 }, + {0x0000a3c4 ,0x22222220 }, + {0x0000a3c8 ,0x20200020 }, + {0x0000a3cc ,0x20202020 }, + {0x0000a3d0 ,0x20202020 }, + {0x0000a3d4 ,0x20202020 }, + {0x0000a3d8 ,0x20202020 }, + {0x0000a3dc ,0x20202020 }, + {0x0000a3e0 ,0x20202020 }, + {0x0000a3e4 ,0x20202020 }, + {0x0000a3e8 ,0x20202020 }, + {0x0000a3ec ,0x20202020 }, + {0x0000a3f0 ,0x00000000 }, + {0x0000a3f4 ,0x00000000 }, + {0x0000a3f8 ,0x0c9bd380 }, + {0x0000a3fc ,0x000f0f01 }, + {0x0000a400 ,0x8fa91f01 }, + {0x0000a404 ,0x00000000 }, + {0x0000a408 ,0x0e79e5c6 }, + {0x0000a40c ,0x00820820 }, + {0x0000a414 ,0x1ce42108 }, + {0x0000a418 ,0x2d001dce }, + {0x0000a41c ,0x1ce73908 }, + {0x0000a420 ,0x000001ce }, + {0x0000a424 ,0x1ce738e7 }, + {0x0000a428 ,0x000001ce }, + {0x0000a42c ,0x1ce739ce }, + {0x0000a430 ,0x1ce739ce }, + {0x0000a434 ,0x00000000 }, + {0x0000a438 ,0x00001801 }, + {0x0000a43c ,0x00100000 }, + {0x0000a444 ,0x00000000 }, + {0x0000a448 ,0x05000080 }, + {0x0000a44c ,0x00000001 }, + {0x0000a450 ,0x00010000 }, + {0x0000a458 ,0x00000000 }, + {0x0000a644 ,0xbfad9d74 }, + {0x0000a648 ,0x0048060a }, + {0x0000a64c ,0x00003c37 }, + {0x0000a670 ,0x03020100 }, + {0x0000a674 ,0x09080504 }, + {0x0000a678 ,0x0d0c0b0a }, + {0x0000a67c ,0x13121110 }, + {0x0000a680 ,0x31301514 }, + {0x0000a684 ,0x35343332 }, + {0x0000a688 ,0x00000036 }, + {0x0000a690 ,0x08000838 }, + {0x0000a7cc ,0x00000000 }, + {0x0000a7d0 ,0x00000000 }, + {0x0000a7d4 ,0x00000004 }, + {0x0000a7dc ,0x00000000 }, + {0x0000a8d0 ,0x004b6a8e }, + {0x0000a8d4 ,0x00000820 }, + {0x0000a8dc ,0x00000000 }, + {0x0000a8f0 ,0x00000000 }, + {0x0000a8f4 ,0x00000000 }, + {0x0000b2d0 ,0x00000080 }, + {0x0000b2d4 ,0x00000000 }, + {0x0000b2ec ,0x00000000 }, + {0x0000b2f0 ,0x00000000 }, + {0x0000b2f4 ,0x00000000 }, + {0x0000b2f8 ,0x00000000 }, + {0x0000b408 ,0x0e79e5c0 }, + {0x0000b40c ,0x00820820 }, + {0x0000b420 ,0x00000000 }, +}; + +static const u32 qca953x_1p0_baseband_postamble[][5 ] = { +/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ + {0x00009810 ,0xd00a8005 ,0xd00a8005 ,0xd00a8011 ,0xd00a8011 }, + {0x00009820 ,0x206a022e ,0x206a022e ,0x206a012e ,0x206a012e }, + {0x00009824 ,0x5ac640d0 ,0x5ac640d0 ,0x5ac640d0 ,0x5ac640d0 }, + {0x00009828 ,0x06903081 ,0x06903081 ,0x06903881 ,0x06903881 }, + {0x0000982c ,0x05eea6d4 ,0x05eea6d4 ,0x05eea6d4 ,0x05eea6d4 }, + {0x00009830 ,0x0000059c ,0x0000059c ,0x0000119c ,0x0000119c }, + {0x00009c00 ,0x000000c4 ,0x000000c4 ,0x000000c4 ,0x000000c4 }, + {0x00009e00 ,0x0372111a ,0x0372111a ,0x037216a0 ,0x037216a0 }, + {0x00009e04 ,0x001c2020 ,0x001c2020 ,0x001c2020 ,0x001c2020 }, + {0x00009e0c ,0x6c4000e2 ,0x6d4000e2 ,0x6d4000e2 ,0x6c4000e2 }, + {0x00009e10 ,0x7ec88d2e ,0x7ec88d2e ,0x7ec84d2e ,0x7ec84d2e }, + {0x00009e14 ,0x37b95d5e ,0x37b9605e ,0x3379605e ,0x33795d5e }, + {0x00009e18 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x00009e1c ,0x0001cf9c ,0x0001cf9c ,0x00021f9c ,0x00021f9c }, + {0x00009e20 ,0x000003b5 ,0x000003b5 ,0x000003ce ,0x000003ce }, + {0x00009e2c ,0x0000001c ,0x0000001c ,0x00000021 ,0x00000021 }, + {0x00009e3c ,0xcfa10820 ,0xcfa10820 ,0xcfa10822 ,0xcfa10822 }, + {0x00009e44 ,0xfe321e27 ,0xfe321e27 ,0xfe291e27 ,0xfe291e27 }, + {0x00009e48 ,0x5030201a ,0x5030201a ,0x50302012 ,0x50302012 }, + {0x00009fc8 ,0x0003f000 ,0x0003f000 ,0x0001a000 ,0x0001a000 }, + {0x0000a204 ,0x005c0ec0 ,0x005c0ec4 ,0x005c0ec4 ,0x005c0ec0 }, + {0x0000a208 ,0x00000104 ,0x00000104 ,0x00000004 ,0x00000004 }, + {0x0000a22c ,0x07e26a2f ,0x07e26a2f ,0x01026a2f ,0x01026a2f }, + {0x0000a230 ,0x0000000a ,0x00000014 ,0x00000016 ,0x0000000b }, + {0x0000a234 ,0x00000fff ,0x10000fff ,0x10000fff ,0x00000fff }, + {0x0000a238 ,0xffb01018 ,0xffb01018 ,0xffb01018 ,0xffb01018 }, + {0x0000a250 ,0x00000000 ,0x00000000 ,0x00000210 ,0x00000108 }, + {0x0000a254 ,0x000007d0 ,0x00000fa0 ,0x00001130 ,0x00000898 }, + {0x0000a258 ,0x02020002 ,0x02020002 ,0x02020002 ,0x02020002 }, + {0x0000a25c ,0x01000e0e ,0x01000e0e ,0x01010e0e ,0x01010e0e }, + {0x0000a260 ,0x0a021501 ,0x0a021501 ,0x3a021501 ,0x3a021501 }, + {0x0000a264 ,0x00000e0e ,0x00000e0e ,0x01000e0e ,0x01000e0e }, + {0x0000a280 ,0x00000007 ,0x00000007 ,0x0000000b ,0x0000000b }, + {0x0000a284 ,0x00000000 ,0x00000000 ,0x00000010 ,0x00000010 }, + {0x0000a288 ,0x00000110 ,0x00000110 ,0x00000110 ,0x00000110 }, + {0x0000a28c ,0x00022222 ,0x00022222 ,0x00022222 ,0x00022222 }, + {0x0000a2c4 ,0x00158d18 ,0x00158d18 ,0x00158d18 ,0x00158d18 }, + {0x0000a2cc ,0x18c50033 ,0x18c43433 ,0x18c41033 ,0x18c44c33 }, + {0x0000a2d0 ,0x00041982 ,0x00041982 ,0x00041982 ,0x00041982 }, + {0x0000a2d8 ,0x7999a83b ,0x7999a83b ,0x7999a83b ,0x7999a83b }, + {0x0000a358 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000a830 ,0x0000019c ,0x0000019c ,0x0000019c ,0x0000019c }, + {0x0000ae04 ,0x001c0000 ,0x001c0000 ,0x001c0000 ,0x001c0000 }, + {0x0000ae18 ,0x00000000 ,0x00000000 ,0x00000000 ,0x00000000 }, + {0x0000ae1c ,0x0000019c ,0x0000019c ,0x0000019c ,0x0000019c }, + {0x0000ae20 ,0x000001b5 ,0x000001b5 ,0x000001ce ,0x000001ce }, + {0x0000b284 ,0x00000000 ,0x00000000 ,0x00000010 ,0x00000010 }, +}; + +static const u32 qca953x_1p0_radio_core[][2 ] = { +/* Addr allmodes */ + {0x00016000 ,0x36db6db6 }, + {0x00016004 ,0x6db6db40 }, + {0x00016008 ,0x73f00000 }, + {0x0001600c ,0x00000000 }, + {0x00016040 ,0x3f80fff8 }, + {0x0001604c ,0x000f0278 }, + {0x00016050 ,0x8036db6c }, + {0x00016054 ,0x6db60000 }, + {0x00016080 ,0x00080000 }, + {0x00016084 ,0x0e48048c }, + {0x00016088 ,0x14214514 }, + {0x0001608c ,0x119f080a }, + {0x00016090 ,0x24926490 }, + {0x00016094 ,0x00000000 }, + {0x000160a0 ,0xc2108ffe }, + {0x000160a4 ,0x812fc370 }, + {0x000160a8 ,0x423c8000 }, + {0x000160b4 ,0x92480080 }, + {0x000160c0 ,0x006db6d8 }, + {0x000160c4 ,0x24b6db6c }, + {0x000160c8 ,0x6db6db6c }, + {0x000160cc ,0x6db6fb7c }, + {0x000160d0 ,0x6db6da44 }, + {0x00016100 ,0x07ff8001 }, + {0x00016108 ,0x00080010 }, + {0x00016144 ,0x01884080 }, + {0x00016148 ,0x000080d8 }, + {0x00016280 ,0x01000901 }, + {0x00016284 ,0x15d30000 }, + {0x00016288 ,0x00318000 }, + {0x0001628c ,0x50000000 }, + {0x00016380 ,0x00000000 }, + {0x00016384 ,0x00000000 }, + {0x00016388 ,0x00800700 }, + {0x0001638c ,0x00800700 }, + {0x00016390 ,0x00800700 }, + {0x00016394 ,0x00000000 }, + {0x00016398 ,0x00000000 }, + {0x0001639c ,0x00000000 }, + {0x000163a0 ,0x00000001 }, + {0x000163a4 ,0x00000001 }, + {0x000163a8 ,0x00000000 }, + {0x000163ac ,0x00000000 }, + {0x000163b0 ,0x00000000 }, + {0x000163b4 ,0x00000000 }, + {0x000163b8 ,0x00000000 }, + {0x000163bc ,0x00000000 }, + {0x000163c0 ,0x000000a0 }, + {0x000163c4 ,0x000c0000 }, + {0x000163c8 ,0x14021402 }, + {0x000163cc ,0x00001402 }, + {0x000163d0 ,0x00000000 }, + {0x000163d4 ,0x00000000 }, + {0x00016400 ,0x36db6db6 }, + {0x00016404 ,0x6db6db40 }, + {0x00016408 ,0x73f00000 }, + {0x0001640c ,0x00000000 }, + {0x00016440 ,0x3f80fff8 }, + {0x0001644c ,0x000f0278 }, + {0x00016450 ,0x8036db6c }, + {0x00016454 ,0x6db60000 }, + {0x00016500 ,0x07ff8001 }, + {0x00016508 ,0x00080010 }, + {0x00016544 ,0x01884080 }, + {0x00016548 ,0x000080d8 }, + {0x00016780 ,0x00000000 }, + {0x00016784 ,0x00000000 }, + {0x00016788 ,0x00800700 }, + {0x0001678c ,0x00800700 }, + {0x00016790 ,0x00800700 }, + {0x00016794 ,0x00000000 }, + {0x00016798 ,0x00000000 }, + {0x0001679c ,0x00000000 }, + {0x000167a0 ,0x00000001 }, + {0x000167a4 ,0x00000001 }, + {0x000167a8 ,0x00000000 }, + {0x000167ac ,0x00000000 }, + {0x000167b0 ,0x00000000 }, + {0x000167b4 ,0x00000000 }, + {0x000167b8 ,0x00000000 }, + {0x000167bc ,0x00000000 }, + {0x000167c0 ,0x000000a0 }, + {0x000167c4 ,0x000c0000 }, + {0x000167c8 ,0x14021402 }, + {0x000167cc ,0x00001402 }, + {0x000167d0 ,0x00000000 }, + {0x000167d4 ,0x00000000 }, +}; + +static const u32 qca953x_1p0_radio_postamble[][5 ] = { +/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ + {0x00016098 ,0xd2dd5554 ,0xd2dd5554 ,0xc4128f5c ,0xc4128f5c }, + {0x0001609c ,0x0a566f3a ,0x0a566f3a ,0x0fd08f25 ,0x0fd08f25 }, + {0x000160ac ,0xa4647c00 ,0xa4647c00 ,0x24646800 ,0x24646800 }, + {0x000160b0 ,0x01885f52 ,0x01885f52 ,0x00fe7f46 ,0x00fe7f46 }, + {0x00016104 ,0xb7a00001 ,0xb7a00001 ,0xfff80005 ,0xfff80005 }, + {0x0001610c ,0xc0000000 ,0xc0000000 ,0x00000000 ,0x00000000 }, + {0x00016140 ,0x10804008 ,0x10804008 ,0x50804000 ,0x50804000 }, + {0x00016504 ,0xb7a00001 ,0xb7a00001 ,0xfff80001 ,0xfff80001 }, + {0x0001650c ,0xc0000000 ,0xc0000000 ,0x00000000 ,0x00000000 }, + {0x00016540 ,0x10804008 ,0x10804008 ,0x50804000 ,0x50804000 }, +}; + +static const u32 qca953x_1p0_soc_preamble[][2 ] = { +/* Addr allmodes */ + {0x00007000 ,0x00000000 }, + {0x00007004 ,0x00000000 }, + {0x00007008 ,0x00000000 }, + {0x0000700c ,0x00000000 }, + {0x0000701c ,0x00000000 }, + {0x00007020 ,0x00000000 }, + {0x00007024 ,0x00000000 }, + {0x00007028 ,0x00000000 }, + {0x0000702c ,0x00000000 }, + {0x00007030 ,0x00000000 }, + {0x00007034 ,0x00000002 }, + {0x00007038 ,0x000004c2 }, + {0x00007048 ,0x00000000 }, +}; + +static const u32 qca953x_1p0_common_rx_gain_bounds[][5 ] = { +/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ + {0x00009e44 ,0xfe321e27 ,0xfe321e27 ,0xfe291e27 ,0xfe291e27 }, + {0x00009e48 ,0x5030201a ,0x5030201a ,0x50302018 ,0x50302018 }, +}; + +static const u32 qca953x_1p0_common_wo_xlna_rx_gain_bounds[][5 ] = { +/* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */ + {0x00009e44 ,0xfe321e27 ,0xfe321e27 ,0xfe291e27 ,0xfe291e27 }, + {0x00009e48 ,0x5030201a ,0x5030201a ,0x50302012 ,0x50302012 }, +}; + +static const u32 qca953x_1p0_modes_xpa_tx_gain_table[][2 ] = { +/* Addr allmodes */ + {0x0000a2dc ,0xfffd5aaa }, + {0x0000a2e0 ,0xfffe9ccc }, + {0x0000a2e4 ,0xffffe0f0 }, + {0x0000a2e8 ,0xfffcff00 }, + {0x0000a410 ,0x000050da }, + {0x0000a500 ,0x00000000 }, + {0x0000a504 ,0x04000002 }, + {0x0000a508 ,0x08000004 }, + {0x0000a50c ,0x0c000006 }, + {0x0000a510 ,0x0f00000a }, + {0x0000a514 ,0x1300000c }, + {0x0000a518 ,0x1700000e }, + {0x0000a51c ,0x1b000064 }, + {0x0000a520 ,0x1f000242 }, + {0x0000a524 ,0x23000229 }, + {0x0000a528 ,0x270002a2 }, + {0x0000a52c ,0x2c001203 }, + {0x0000a530 ,0x30001803 }, + {0x0000a534 ,0x33000881 }, + {0x0000a538 ,0x38001809 }, + {0x0000a53c ,0x3a000814 }, + {0x0000a540 ,0x3f001a0c }, + {0x0000a544 ,0x43001a0e }, + {0x0000a548 ,0x46001812 }, + {0x0000a54c ,0x49001884 }, + {0x0000a550 ,0x4d001e84 }, + {0x0000a554 ,0x50001e69 }, + {0x0000a558 ,0x550006f4 }, + {0x0000a55c ,0x59000ad3 }, + {0x0000a560 ,0x5e000ad5 }, + {0x0000a564 ,0x61001ced }, + {0x0000a568 ,0x660018d4 }, + {0x0000a56c ,0x660018d4 }, + {0x0000a570 ,0x660018d4 }, + {0x0000a574 ,0x660018d4 }, + {0x0000a578 ,0x660018d4 }, + {0x0000a57c ,0x660018d4 }, + {0x0000a600 ,0x00000000 }, + {0x0000a604 ,0x00000000 }, + {0x0000a608 ,0x00000000 }, + {0x0000a60c ,0x03804000 }, + {0x0000a610 ,0x0300ca02 }, + {0x0000a614 ,0x00000e04 }, + {0x0000a618 ,0x03014000 }, + {0x0000a61c ,0x00000000 }, + {0x0000a620 ,0x00000000 }, + {0x0000a624 ,0x03014000 }, + {0x0000a628 ,0x03804c05 }, + {0x0000a62c ,0x0701de06 }, + {0x0000a630 ,0x07819c07 }, + {0x0000a634 ,0x0701dc07 }, + {0x0000a638 ,0x0701dc07 }, + {0x0000a63c ,0x0701dc07 }, + {0x0000b2dc ,0xfffd5aaa }, + {0x0000b2e0 ,0xfffe9ccc }, + {0x0000b2e4 ,0xffffe0f0 }, + {0x0000b2e8 ,0xfffcff00 }, + {0x00016044 ,0x010002d4 }, + {0x00016048 ,0x66482400 }, + {0x00016280 ,0x01000015 }, + {0x00016444 ,0x010002d4 }, + {0x00016448 ,0x66482400 }, +}; + +static const u32 qca953x_1p0_modes_no_xpa_tx_gain_table[][2 ] = { +/* Addr allmodes */ + {0x0000a2dc ,0xffd5f552 }, + {0x0000a2e0 ,0xffe60664 }, + {0x0000a2e4 ,0xfff80780 }, + {0x0000a2e8 ,0xfffff800 }, + {0x0000a410 ,0x000050d6 }, + {0x0000a500 ,0x00060020 }, + {0x0000a504 ,0x04060060 }, + {0x0000a508 ,0x080600a0 }, + {0x0000a50c ,0x0c068020 }, + {0x0000a510 ,0x10068060 }, + {0x0000a514 ,0x140680a0 }, + {0x0000a518 ,0x18090040 }, + {0x0000a51c ,0x1b090080 }, + {0x0000a520 ,0x1f0900c0 }, + {0x0000a524 ,0x240c0041 }, + {0x0000a528 ,0x280d0021 }, + {0x0000a52c ,0x2d0f0061 }, + {0x0000a530 ,0x310f00a1 }, + {0x0000a534 ,0x350e00a2 }, + {0x0000a538 ,0x360e80a2 }, + {0x0000a53c ,0x380f00a2 }, + {0x0000a540 ,0x3b0e00a3 }, + {0x0000a544 ,0x3d110083 }, + {0x0000a548 ,0x3e1100a3 }, + {0x0000a54c ,0x401100e3 }, + {0x0000a550 ,0x421380e3 }, + {0x0000a554 ,0x431780e3 }, + {0x0000a558 ,0x461f80e3 }, + {0x0000a55c ,0x461f80e3 }, + {0x0000a560 ,0x461f80e3 }, + {0x0000a564 ,0x461f80e3 }, + {0x0000a568 ,0x461f80e3 }, + {0x0000a56c ,0x461f80e3 }, + {0x0000a570 ,0x461f80e3 }, + {0x0000a574 ,0x461f80e3 }, + {0x0000a578 ,0x461f80e3 }, + {0x0000a57c ,0x461f80e3 }, + {0x0000a600 ,0x00000000 }, + {0x0000a604 ,0x00000000 }, + {0x0000a608 ,0x00000000 }, + {0x0000a60c ,0x00804201 }, + {0x0000a610 ,0x01008201 }, + {0x0000a614 ,0x0180c402 }, + {0x0000a618 ,0x0180c603 }, + {0x0000a61c ,0x0180c603 }, + {0x0000a620 ,0x01c10603 }, + {0x0000a624 ,0x01c10704 }, + {0x0000a628 ,0x02c18b05 }, + {0x0000a62c ,0x0301cc07 }, + {0x0000a630 ,0x0301cc07 }, + {0x0000a634 ,0x0301cc07 }, + {0x0000a638 ,0x0301cc07 }, + {0x0000a63c ,0x0301cc07 }, + {0x0000b2dc ,0xffd5f552 }, + {0x0000b2e0 ,0xffe60664 }, + {0x0000b2e4 ,0xfff80780 }, + {0x0000b2e8 ,0xfffff800 }, + {0x00016044 ,0x049242db }, + {0x00016048 ,0x6c927a70 }, + {0x00016444 ,0x049242db }, + {0x00016448 ,0x6c927a70 }, +}; + +static const u32 qca953x_1p1_modes_no_xpa_tx_gain_table[][2 ] = { +/* Addr allmodes */ + {0x0000a2dc ,0xffd5f552 }, + {0x0000a2e0 ,0xffe60664 }, + {0x0000a2e4 ,0xfff80780 }, + {0x0000a2e8 ,0xfffff800 }, + {0x0000a410 ,0x000050de }, + {0x0000a500 ,0x00000061 }, + {0x0000a504 ,0x04000063 }, + {0x0000a508 ,0x08000065 }, + {0x0000a50c ,0x0c000261 }, + {0x0000a510 ,0x10000263 }, + {0x0000a514 ,0x14000265 }, + {0x0000a518 ,0x18000482 }, + {0x0000a51c ,0x1b000484 }, + {0x0000a520 ,0x1f000486 }, + {0x0000a524 ,0x240008c2 }, + {0x0000a528 ,0x28000cc1 }, + {0x0000a52c ,0x2d000ce3 }, + {0x0000a530 ,0x31000ce5 }, + {0x0000a534 ,0x350010e5 }, + {0x0000a538 ,0x360012e5 }, + {0x0000a53c ,0x380014e5 }, + {0x0000a540 ,0x3b0018e5 }, + {0x0000a544 ,0x3d001d04 }, + {0x0000a548 ,0x3e001d05 }, + {0x0000a54c ,0x40001d07 }, + {0x0000a550 ,0x42001f27 }, + {0x0000a554 ,0x43001f67 }, + {0x0000a558 ,0x46001fe7 }, + {0x0000a55c ,0x47001f2b }, + {0x0000a560 ,0x49001f0d }, + {0x0000a564 ,0x4b001ed2 }, + {0x0000a568 ,0x4c001ed4 }, + {0x0000a56c ,0x4e001f15 }, + {0x0000a570 ,0x4f001ff6 }, + {0x0000a574 ,0x4f001ff6 }, + {0x0000a578 ,0x4f001ff6 }, + {0x0000a57c ,0x4f001ff6 }, + {0x0000a600 ,0x00000000 }, + {0x0000a604 ,0x00000000 }, + {0x0000a608 ,0x00000000 }, + {0x0000a60c ,0x00804201 }, + {0x0000a610 ,0x01008201 }, + {0x0000a614 ,0x0180c402 }, + {0x0000a618 ,0x0180c603 }, + {0x0000a61c ,0x0180c603 }, + {0x0000a620 ,0x01c10603 }, + {0x0000a624 ,0x01c10704 }, + {0x0000a628 ,0x02c18b05 }, + {0x0000a62c ,0x02c14c07 }, + {0x0000a630 ,0x01008704 }, + {0x0000a634 ,0x01c10402 }, + {0x0000a638 ,0x0301cc07 }, + {0x0000a63c ,0x0301cc07 }, + {0x0000b2dc ,0xffd5f552 }, + {0x0000b2e0 ,0xffe60664 }, + {0x0000b2e4 ,0xfff80780 }, + {0x0000b2e8 ,0xfffff800 }, + {0x00016044 ,0x049242db }, + {0x00016048 ,0x6c927a70 }, + {0x00016444 ,0x049242db }, + {0x00016448 ,0x6c927a70 }, +}; + +#endif /* INITVALS_953X_H */
Signature · 1 line
1.8.5.2
PATCH v2 4/5 ath9k: Initialize QCA953x INI arrays
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Signed-off-by Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 48 +++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath9k/ar9003_hw.c +47 -1
@@ -28,6 +28,7 @@#include "ar9462_2p1_initvals.h" #include "ar9565_1p0_initvals.h" #include "ar9565_1p1_initvals.h" +#include "ar953x_initvals.h" /* General hardware code for the AR9003 hadware family */
@@ -308,6 +309,31 @@ static void ar9003_hw_init_mode_regs(struct ath_hw *ah)/* Fast clock modal settings */ INIT_INI_ARRAY (&ah->iniModesFastClock, ar955x_1p0_modes_fast_clock); + }else if (AR_SREV_9531 (ah)) { +INIT_INI_ARRAY (&ah->iniMac[ATH_INI_CORE ], + qca953x_1p0_mac_core); +INIT_INI_ARRAY (&ah->iniMac[ATH_INI_POST ], + qca953x_1p0_mac_postamble); +INIT_INI_ARRAY (&ah->iniBB[ATH_INI_CORE ], + qca953x_1p0_baseband_core); +INIT_INI_ARRAY (&ah->iniBB[ATH_INI_POST ], + qca953x_1p0_baseband_postamble); +INIT_INI_ARRAY (&ah->iniRadio[ATH_INI_CORE ], + qca953x_1p0_radio_core); +INIT_INI_ARRAY (&ah->iniRadio[ATH_INI_POST ], + qca953x_1p0_radio_postamble); +INIT_INI_ARRAY (&ah->iniSOC[ATH_INI_PRE ], + qca953x_1p0_soc_preamble); +INIT_INI_ARRAY (&ah->iniSOC[ATH_INI_POST ], + qca953x_1p0_soc_postamble); +INIT_INI_ARRAY (&ah->iniModesRxGain, + qca953x_1p0_common_wo_xlna_rx_gain_table); +INIT_INI_ARRAY (&ah->ini_modes_rx_gain_bounds, + qca953x_1p0_common_wo_xlna_rx_gain_bounds); +INIT_INI_ARRAY (&ah->iniModesTxGain, + qca953x_1p0_modes_no_xpa_tx_gain_table); +INIT_INI_ARRAY (&ah->iniModesFastClock, + qca953x_1p0_modes_fast_clock); }else if (AR_SREV_9580 (ah)) {/* mac */ INIT_INI_ARRAY(&ah->iniMac[ATH_INI_CORE],
@@ -485,6 +511,9 @@ static void ar9003_tx_gain_table_mode0(struct ath_hw *ah)else if (AR_SREV_9550 (ah))INIT_INI_ARRAY (&ah->iniModesTxGain, ar955x_1p0_modes_xpa_tx_gain_table); +else if (AR_SREV_9531 (ah)) +INIT_INI_ARRAY (&ah->iniModesTxGain, + qca953x_1p0_modes_xpa_tx_gain_table);else if (AR_SREV_9580 (ah))INIT_INI_ARRAY (&ah->iniModesTxGain, ar9580_1p0_lowest_ob_db_tx_gain_table);
@@ -525,7 +554,14 @@ static void ar9003_tx_gain_table_mode1(struct ath_hw *ah)else if (AR_SREV_9550 (ah))INIT_INI_ARRAY (&ah->iniModesTxGain, ar955x_1p0_modes_no_xpa_tx_gain_table); -else if (AR_SREV_9462_21 (ah)) +else if (AR_SREV_9531 (ah)) { +if (AR_SREV_9531_11 (ah)) +INIT_INI_ARRAY (&ah->iniModesTxGain, + qca953x_1p1_modes_no_xpa_tx_gain_table); +else +INIT_INI_ARRAY (&ah->iniModesTxGain, + qca953x_1p0_modes_no_xpa_tx_gain_table); + }else if (AR_SREV_9462_21 (ah))INIT_INI_ARRAY (&ah->iniModesTxGain, ar9462_2p1_modes_high_ob_db_tx_gain);else if (AR_SREV_9462_20 (ah))
@@ -699,6 +735,11 @@ static void ar9003_rx_gain_table_mode0(struct ath_hw *ah) ar955x_1p0_common_rx_gain_table);INIT_INI_ARRAY (&ah->ini_modes_rx_gain_bounds, ar955x_1p0_common_rx_gain_bounds); + }else if (AR_SREV_9531 (ah)) { +INIT_INI_ARRAY (&ah->iniModesRxGain, + qca953x_1p0_common_rx_gain_table); +INIT_INI_ARRAY (&ah->ini_modes_rx_gain_bounds, + qca953x_1p0_common_rx_gain_bounds); }else if (AR_SREV_9580 (ah))INIT_INI_ARRAY (&ah->iniModesRxGain, ar9580_1p0_rx_gain_table);
@@ -744,6 +785,11 @@ static void ar9003_rx_gain_table_mode1(struct ath_hw *ah) ar955x_1p0_common_wo_xlna_rx_gain_table);INIT_INI_ARRAY (&ah->ini_modes_rx_gain_bounds, ar955x_1p0_common_wo_xlna_rx_gain_bounds); + }else if (AR_SREV_9531 (ah)) { +INIT_INI_ARRAY (&ah->iniModesRxGain, + qca953x_1p0_common_wo_xlna_rx_gain_table); +INIT_INI_ARRAY (&ah->ini_modes_rx_gain_bounds, + qca953x_1p0_common_wo_xlna_rx_gain_bounds); }else if (AR_SREV_9580 (ah))INIT_INI_ARRAY (&ah->iniModesRxGain, ar9580_1p0_wo_xlna_rx_gain_table);
Signature · 1 line
1.8.5.2
PATCH v2 5/5 ath9k: Add hardware support for QCA9531
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
Signed-off-by Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 13 ++++--- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 14 ++++--- drivers/net/wireless/ath/ath9k/hw.c | 52 ++++++++++++++++++++------ drivers/net/wireless/ath/ath9k/recv.c | 2 +- 4 files changed, 57 insertions(+), 24 deletions(-)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +8 -5
@@ -3598,7 +3598,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz)if (AR_SREV_9462 (ah) ||AR_SREV_9565 (ah)) {REG_RMW_FIELD (ah,AR_PHY_SWITCH_COM ,AR_SWITCH_TABLE_COM_AR9462_ALL , value); - }else if (AR_SREV_9550 (ah)) { + }else if (AR_SREV_9550 (ah) ||AR_SREV_9531 (ah)) {REG_RMW_FIELD (ah,AR_PHY_SWITCH_COM ,AR_SWITCH_TABLE_COM_AR9550_ALL , value); }else
@@ -3975,7 +3975,7 @@ static void ar9003_hw_apply_tuning_caps(struct ath_hw *ah)struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;u8 tuning_caps_param = eep->baseEepHeader.params_for_tuning_caps[0 ]; -if (AR_SREV_9340 (ah)) +if (AR_SREV_9340 (ah) ||AR_SREV_9531 (ah))return ;if (eep->baseEepHeader.featureEnable &0x40 ) {
@@ -4030,7 +4030,10 @@ static void ar9003_hw_xpa_timing_control_apply(struct ath_hw *ah, bool is2ghz)if (!(eep->baseEepHeader.featureEnable &0x80 ))return ; -if (!AR_SREV_9300 (ah) && !AR_SREV_9340 (ah) && !AR_SREV_9580 (ah)) +if (!AR_SREV_9300 (ah) && + !AR_SREV_9340 (ah) && + !AR_SREV_9580 (ah) && + !AR_SREV_9531 (ah))return ; xpa_ctl =ar9003_modal_header (ah, is2ghz)->txFrameToXpaOn;
@@ -4163,7 +4166,7 @@ static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,ar9003_hw_xlna_bias_strength_apply (ah, is2ghz);ar9003_hw_atten_apply (ah, chan);ar9003_hw_quick_drop_apply (ah, chan->channel); -if (!AR_SREV_9330 (ah) && !AR_SREV_9340 (ah)) +if (!AR_SREV_9330 (ah) && !AR_SREV_9340 (ah) && !AR_SREV_9531 (ah))ar9003_hw_internal_regulator_apply (ah);ar9003_hw_apply_tuning_caps (ah);ar9003_hw_apply_minccapwr_thresh (ah, chan);
@@ -4788,7 +4791,7 @@ static void ar9003_hw_power_control_override(struct ath_hw *ah, } tempslope: -if (AR_SREV_9550 (ah)) { +if (AR_SREV_9550 (ah) ||AR_SREV_9531 (ah)) {/* * AR955x has tempSlope register for each chain. * Check whether temp_compensation feature is enabled or not.
drivers/net/wireless/ath/ath9k/ar9003_phy.c +8 -6
@@ -103,7 +103,7 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan) }else { channelSel =CHANSEL_2G (freq) >>1 ; } - }else if (AR_SREV_9550 (ah)) { + }else if (AR_SREV_9550 (ah) ||AR_SREV_9531 (ah)) {if (ah->is_clk_25mhz) div =75 ;else
@@ -118,7 +118,7 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)/* Set to 2G mode */ bMode =1 ; }else { -if ((AR_SREV_9340 (ah) ||AR_SREV_9550 (ah)) && +if ((AR_SREV_9340 (ah) ||AR_SREV_9550 (ah) ||AR_SREV_9531 (ah)) && ah->is_clk_25mhz) { channelSel = freq /75 ; chan_frac = ((freq %75 ) *0x20000 ) /75 ;
@@ -810,10 +810,12 @@ static int ar9003_hw_process_ini(struct ath_hw *ah,/* * TXGAIN initvals. */ -if (AR_SREV_9550 (ah)) { -int modes_txgain_index; +if (AR_SREV_9550 (ah) ||AR_SREV_9531 (ah)) { +int modes_txgain_index =1 ; + +if (AR_SREV_9550 (ah)) + modes_txgain_index =ar9550_hw_get_modes_txgain_index (ah, chan); - modes_txgain_index =ar9550_hw_get_modes_txgain_index (ah, chan);if (modes_txgain_index <0 )return -EINVAL ;
@@ -1862,7 +1864,7 @@ bool ar9003_hw_bb_watchdog_check(struct ath_hw *ah)case 0x04000b09 :return true;case 0x04000409 : -if (AR_SREV_9340 (ah)) +if (AR_SREV_9340 (ah) ||AR_SREV_9531 (ah))return false;else return true;
drivers/net/wireless/ath/ath9k/hw.c +40 -12
84 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/recv.c +1 -1
@@ -419,7 +419,7 @@ u32 ath_calcrxfilter(struct ath_softc *sc) rfilt |=ATH9K_RX_FILTER_MCAST_BCAST_ALL ; } -if (AR_SREV_9550 (sc->sc_ah)) +if (AR_SREV_9550 (sc->sc_ah) ||AR_SREV_9531 (sc->sc_ah)) rfilt |=ATH9K_RX_FILTER_4ADDRESS ;return rfilt;
Signature · 1 line
1.8.5.2