Signed-off-by: Bartosz Markowski <bartosz.markow...@tieto.com>
---
drivers/net/wireless/ath/ath10k/bmi.h | 4 +--
drivers/net/wireless/ath/ath10k/core.c | 38 +++++++++++++--------------
drivers/net/wireless/ath/ath10k/core.h | 2 +-
drivers/net/wireless/ath/ath10k/htt.h | 2 +-
drivers/net/wireless/ath/ath10k/hw.h | 32 +++++++++++-----------
drivers/net/wireless/ath/ath10k/pci.c | 36 ++++++++++++-------------
drivers/net/wireless/ath/ath10k/pci.h | 2 +-
drivers/net/wireless/ath/ath10k/targaddrs.h | 6 ++---
8 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/bmi.h
b/drivers/net/wireless/ath/ath10k/bmi.h
index 49261d7..ac8daef 100644
--- a/drivers/net/wireless/ath/ath10k/bmi.h
+++ b/drivers/net/wireless/ath/ath10k/bmi.h
@@ -27,8 +27,8 @@
* to read memory, write memory, execute code, and to define an
* application entry PC.
*
- * It is used to download an application to AR9K, to provide
- * patches to code that is already resident on AR9K, and generally
+ * It is used to download an application to QCA988x, to provide
+ * patches to code that is already resident on QCA988x, and generally
* to examine and modify state. The Host has an opportunity to use
* BMI only once during bootup. Once the Host issues a BMI_DONE
* command, this opportunity ends.
diff --git a/drivers/net/wireless/ath/ath10k/core.c
b/drivers/net/wireless/ath/ath10k/core.c
index 186b216..b1b836e 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -45,25 +45,25 @@ enum ath10k_file {
static const struct ath10k_hw_params ath10k_hw_params_list[] = {
{
- .id = AR9888_HW_1_0_VERSION,
+ .id = QCA988X_HW_1_0_VERSION,
.name = "qca988x hw1.0",
- .patch_load_addr = AR9888_HW_1_0_PATCH_LOAD_ADDR,
+ .patch_load_addr = QCA988X_HW_1_0_PATCH_LOAD_ADDR,
.fw = {
- .dir = AR9888_HW_1_0_FW_DIR,
- .fw = AR9888_HW_1_0_FW_FILE,
- .otp = AR9888_HW_1_0_OTP_FILE,
- .board = AR9888_HW_1_0_BOARD_DATA_FILE,
+ .dir = QCA988X_HW_1_0_FW_DIR,
+ .fw = QCA988X_HW_1_0_FW_FILE,
+ .otp = QCA988X_HW_1_0_OTP_FILE,
+ .board = QCA988X_HW_1_0_BOARD_DATA_FILE,
},
},
{
- .id = AR9888_HW_2_0_VERSION,
+ .id = QCA988X_HW_2_0_VERSION,
.name = "qca988x hw2.0",
- .patch_load_addr = AR9888_HW_2_0_PATCH_LOAD_ADDR,
+ .patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,
.fw = {
- .dir = AR9888_HW_2_0_FW_DIR,
- .fw = AR9888_HW_2_0_FW_FILE,
- .otp = AR9888_HW_2_0_OTP_FILE,
- .board = AR9888_HW_2_0_BOARD_DATA_FILE,
+ .dir = QCA988X_HW_2_0_FW_DIR,
+ .fw = QCA988X_HW_2_0_FW_FILE,
+ .otp = QCA988X_HW_2_0_OTP_FILE,
+ .board = QCA988X_HW_2_0_BOARD_DATA_FILE,
},
},
};
@@ -260,10 +260,10 @@ static int ath10k_init_transfer_bin_file(struct ath10k
*ar,
* Check whether the target has allocated memory for extended
* board data and file contains extended board data
*/
- if (board_ext_address && (fw_entry_size ==
(AR9888_BOARD_DATA_SZ + AR9888_BOARD_EXT_DATA_SZ))) {
+ if (board_ext_address && (fw_entry_size ==
(QCA988X_BOARD_DATA_SZ + QCA988X_BOARD_EXT_DATA_SZ))) {
status = ath10k_bmi_write_memory(ar, board_ext_address,
- (u8 *)(((unsigned
long)temp_eeprom) + AR9888_BOARD_DATA_SZ),
-
AR9888_BOARD_EXT_DATA_SZ);
+ (u8 *)(((unsigned
long)temp_eeprom) + QCA988X_BOARD_DATA_SZ),
+
QCA988X_BOARD_EXT_DATA_SZ);
if (status != 0) {
ath10k_err("ath10k: BMI operation failed\n");
@@ -274,9 +274,9 @@ static int ath10k_init_transfer_bin_file(struct ath10k *ar,
* Record the fact that extended board Data IS
initialized
*/
ath10k_bmi_write32(ar, hi_board_ext_data_config,
- (AR9888_BOARD_EXT_DATA_SZ << 16) |
1);
+ (QCA988X_BOARD_EXT_DATA_SZ << 16) |
1);
- fw_entry_size = AR9888_BOARD_DATA_SZ;
+ fw_entry_size = QCA988X_BOARD_DATA_SZ;
}
}
@@ -354,7 +354,7 @@ static int ath10k_init_download_firmware(struct ath10k *ar)
}
if (uart_print) {
- /* Configure GPIO AR9888 UART */
+ /* Configure GPIO QCA988X UART */
ath10k_bmi_write32(ar, hi_dbg_uart_txpin, 7);
ath10k_bmi_write32(ar, hi_serial_enable, 1);
} else {
@@ -610,5 +610,5 @@ int ath10k_core_target_resume(struct ath10k *ar) {
EXPORT_SYMBOL(ath10k_core_target_resume);
MODULE_AUTHOR("Qualcomm Atheros");
-MODULE_DESCRIPTION("Core module for AR9888 PCIe devices.");
+MODULE_DESCRIPTION("Core module for QCA988X PCIe devices.");
MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/net/wireless/ath/ath10k/core.h
b/drivers/net/wireless/ath/ath10k/core.h
index 9f1a9fc..225089d 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -107,7 +107,7 @@ static inline int ath10k_skb_unmap(struct device *dev,
struct sk_buff *skb)
static inline u32 host_interest_item_address(u32 item_offset)
{
- return AR9888_HOST_INTEREST_ADDRESS + item_offset;
+ return QCA988X_HOST_INTEREST_ADDRESS + item_offset;
}
struct ath10k_bmi {
diff --git a/drivers/net/wireless/ath/ath10k/htt.h
b/drivers/net/wireless/ath/ath10k/htt.h
index 1b62064..2f353d5 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -962,7 +962,7 @@ static inline struct htt_stats_conf_item
*htt_stats_conf_next_item(
* MSDU_EXT/FRAG_DESC that will be used by the HTT to map MSDU DESC and
* MSDU_EXT/FRAG_DESC.
* HTT will use id in HTT descriptor instead sending the frag_desc_ptr.
- * For AR9888 HW the firmware will use fragment_desc_ptr but in WIFI2.0
+ * For QCA988X HW the firmware will use fragment_desc_ptr but in WIFI2.0
* the hardware does the mapping/translation.
*
* Total banks that can be configured is configured to 16.
diff --git a/drivers/net/wireless/ath/ath10k/hw.h
b/drivers/net/wireless/ath/ath10k/hw.h
index 1b6afa6..6c2a0cd 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -26,21 +26,21 @@
#define SUPPORTED_FW_RELEASE 0
#define SUPPORTED_FW_BUILD 599
-/* AR9888 1.0 definitions */
-#define AR9888_HW_1_0_VERSION 0x4000002c
-#define AR9888_HW_1_0_FW_DIR "ath10k/AR9888/hw1.0"
-#define AR9888_HW_1_0_FW_FILE "firmware.bin"
-#define AR9888_HW_1_0_OTP_FILE "otp.bin"
-#define AR9888_HW_1_0_BOARD_DATA_FILE "board.bin"
-#define AR9888_HW_1_0_PATCH_LOAD_ADDR 0x1234
+/* QCA988X 1.0 definitions */
+#define QCA988X_HW_1_0_VERSION 0x4000002c
+#define QCA988X_HW_1_0_FW_DIR "ath10k/AR9888/hw1.0"
+#define QCA988X_HW_1_0_FW_FILE "firmware.bin"
+#define QCA988X_HW_1_0_OTP_FILE "otp.bin"
+#define QCA988X_HW_1_0_BOARD_DATA_FILE "board.bin"
+#define QCA988X_HW_1_0_PATCH_LOAD_ADDR 0x1234
-/* AR9888 2.0 definitions */
-#define AR9888_HW_2_0_VERSION 0x4100016c
-#define AR9888_HW_2_0_FW_DIR "ath10k/AR9888/hw2.0"
-#define AR9888_HW_2_0_FW_FILE "firmware.bin"
-#define AR9888_HW_2_0_OTP_FILE "otp.bin"
-#define AR9888_HW_2_0_BOARD_DATA_FILE "board.bin"
-#define AR9888_HW_2_0_PATCH_LOAD_ADDR 0x1234
+/* QCA988X 2.0 definitions */
+#define QCA988X_HW_2_0_VERSION 0x4100016c
+#define QCA988X_HW_2_0_FW_DIR "ath10k/AR9888/hw2.0"
+#define QCA988X_HW_2_0_FW_FILE "firmware.bin"
+#define QCA988X_HW_2_0_OTP_FILE "otp.bin"
+#define QCA988X_HW_2_0_BOARD_DATA_FILE "board.bin"
+#define QCA988X_HW_2_0_PATCH_LOAD_ADDR 0x1234
/* Known pecularities:
* - current FW doesn't support raw rx mode (last tested v599)
@@ -298,8 +298,8 @@ enum ath10k_mcast2ucast_mode {
#define WINDOW_READ_ADDR_ADDRESS MISSING
#define WINDOW_WRITE_ADDR_ADDRESS MISSING
-#define MY_TARGET_BOARD_DATA_SZ AR9888_BOARD_DATA_SZ
-#define MY_TARGET_BOARD_EXT_DATA_SZ AR9888_BOARD_EXT_DATA_SZ
+#define MY_TARGET_BOARD_DATA_SZ QCA988X_BOARD_DATA_SZ
+#define MY_TARGET_BOARD_EXT_DATA_SZ QCA988X_BOARD_EXT_DATA_SZ
#define RTC_STATE_V_GET(x) \
(((x) & RTC_STATE_V_MASK) >> RTC_STATE_V_LSB)
diff --git a/drivers/net/wireless/ath/ath10k/pci.c
b/drivers/net/wireless/ath/ath10k/pci.c
index e824d98..580d307 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -36,12 +36,12 @@ unsigned int ath10k_target_ps;
module_param(ath10k_target_ps, uint, 0644);
MODULE_PARM_DESC(ath10k_target_ps, "Enable ath10k Target (SoC) PS option");
-#define AR9888_1_0_DEVICE_ID (0xabcd)
-#define AR9888_2_0_DEVICE_ID (0x003c)
+#define QCA988X_1_0_DEVICE_ID (0xabcd)
+#define QCA988X_2_0_DEVICE_ID (0x003c)
static DEFINE_PCI_DEVICE_TABLE(ath10k_pci_id_table) = {
- { PCI_VDEVICE(ATHEROS, AR9888_1_0_DEVICE_ID) }, /* PCI-E AR9888 V1 */
- { PCI_VDEVICE(ATHEROS, AR9888_2_0_DEVICE_ID) }, /* PCI-E AR9888 V2 */
+ { PCI_VDEVICE(ATHEROS, QCA988X_1_0_DEVICE_ID) }, /* PCI-E QCA988X V1 */
+ { PCI_VDEVICE(ATHEROS, QCA988X_2_0_DEVICE_ID) }, /* PCI-E QCA988X V2 */
{0}
};
@@ -690,7 +690,7 @@ static u16 ath10k_pci_hif_get_free_queue_number(struct
ath10k *ar, u8 pipe)
static void ath10k_pci_hif_dump_area(struct ath10k *ar)
{
u32 reg_dump_area = 0;
- u32 reg_dump_values[REG_DUMP_COUNT_AR9888];
+ u32 reg_dump_values[REG_DUMP_COUNT_QCA988X];
u32 host_addr;
u32 i;
@@ -705,13 +705,13 @@ static void ath10k_pci_hif_dump_area(struct ath10k *ar)
if (ath10k_pci_diag_read_mem(ar, reg_dump_area,
(u8 *) ®_dump_values[0],
- REG_DUMP_COUNT_AR9888 * sizeof(u32)) != 0)
{
+ REG_DUMP_COUNT_QCA988X * sizeof(u32)) !=
0) {
ath10k_err("could not dump FW Dump Area\n");
return;
}
ath10k_err("target Register Dump\n");
- for (i = 0; i < REG_DUMP_COUNT_AR9888; i++)
+ for (i = 0; i < REG_DUMP_COUNT_QCA988X; i++)
ath10k_err("[%02d]: 0x%08X\n", i, reg_dump_values[i]);
}
@@ -2163,9 +2163,9 @@ retry:
ar_pci->dev = &pdev->dev;
switch (pci_dev->device) {
- case AR9888_1_0_DEVICE_ID:
+ case QCA988X_1_0_DEVICE_ID:
break;
- case AR9888_2_0_DEVICE_ID:
+ case QCA988X_2_0_DEVICE_ID:
set_bit(ATH10K_PCI_FEATURE_MSI_X, ar_pci->features);
break;
default:
@@ -2184,8 +2184,8 @@ retry:
goto err_ar_pci;
}
- /* Enable AR9888 V1 HW workarounds */
- if (pci_dev->device == AR9888_1_0_DEVICE_ID) {
+ /* Enable QCA988X_1.0 HW workarounds */
+ if (pci_dev->device == QCA988X_1_0_DEVICE_ID) {
ar_pci->hw_v1_workaround = true;
spin_lock_init(&ar_pci->hw_v1_workaround_lock);
}
@@ -2507,11 +2507,11 @@ static void __exit ath10k_pci_exit(void)
module_exit(ath10k_pci_exit);
MODULE_AUTHOR("Qualcomm Atheros");
-MODULE_DESCRIPTION("Driver support for Atheros AR9888 PCIe devices");
+MODULE_DESCRIPTION("Driver support for Atheros QCA988X PCIe devices");
MODULE_LICENSE("Dual BSD/GPL");
-MODULE_FIRMWARE(AR9888_HW_1_0_FW_DIR "/" AR9888_HW_1_0_FW_FILE);
-MODULE_FIRMWARE(AR9888_HW_1_0_FW_DIR "/" AR9888_HW_1_0_OTP_FILE);
-MODULE_FIRMWARE(AR9888_HW_1_0_FW_DIR "/" AR9888_HW_1_0_BOARD_DATA_FILE);
-MODULE_FIRMWARE(AR9888_HW_2_0_FW_DIR "/" AR9888_HW_2_0_FW_FILE);
-MODULE_FIRMWARE(AR9888_HW_2_0_FW_DIR "/" AR9888_HW_2_0_OTP_FILE);
-MODULE_FIRMWARE(AR9888_HW_2_0_FW_DIR "/" AR9888_HW_2_0_BOARD_DATA_FILE);
+MODULE_FIRMWARE(QCA988X_HW_1_0_FW_DIR "/" QCA988X_HW_1_0_FW_FILE);
+MODULE_FIRMWARE(QCA988X_HW_1_0_FW_DIR "/" QCA988X_HW_1_0_OTP_FILE);
+MODULE_FIRMWARE(QCA988X_HW_1_0_FW_DIR "/" QCA988X_HW_1_0_BOARD_DATA_FILE);
+MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_FW_FILE);
+MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_OTP_FILE);
+MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_BOARD_DATA_FILE);
diff --git a/drivers/net/wireless/ath/ath10k/pci.h
b/drivers/net/wireless/ath/ath10k/pci.h
index add59ea..ae266f2 100644
--- a/drivers/net/wireless/ath/ath10k/pci.h
+++ b/drivers/net/wireless/ath/ath10k/pci.h
@@ -24,7 +24,7 @@
#include "ce.h"
/* FW dump area */
-#define REG_DUMP_COUNT_AR9888 60
+#define REG_DUMP_COUNT_QCA988X 60
/*
* maximum number of bytes that can be handled atomically by DiagRead/DiagWrite
diff --git a/drivers/net/wireless/ath/ath10k/targaddrs.h
b/drivers/net/wireless/ath/ath10k/targaddrs.h
index 0302fab..be7ba1e 100644
--- a/drivers/net/wireless/ath/ath10k/targaddrs.h
+++ b/drivers/net/wireless/ath/ath10k/targaddrs.h
@@ -31,7 +31,7 @@
* write a single binary that works with all Target Types.
* May be used in assembler code as well as C.
*/
-#define AR9888_HOST_INTEREST_ADDRESS 0x00400800
+#define QCA988X_HOST_INTEREST_ADDRESS 0x00400800
#define HOST_INTEREST_MAX_SIZE 0x200
/*
@@ -443,7 +443,7 @@ Fw Mode/SubMode Mask
((HOST_INTEREST->hi_smps_options & HI_SMPS_ALLOW_MASK))
/* Reserve 1024 bytes for extended board data */
-#define AR9888_BOARD_DATA_SZ 7168
-#define AR9888_BOARD_EXT_DATA_SZ 0
+#define QCA988X_BOARD_DATA_SZ 7168
+#define QCA988X_BOARD_EXT_DATA_SZ 0
#endif /* __TARGADDRS_H__ */
--
1.7.10
_______________________________________________
ath9k-devel mailing list
ath9k-devel@lists.ath9k.org
https://lists.ath9k.org/mailman/listinfo/ath9k-devel
