ath10k: temp support qca6164

vvanpo · Aug 7, 2015 · 22f8a40 · 22f8a40
1 parent 3773712
commit 22f8a40
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
@@ -231,6 +231,12 @@ static int ath10k_init_configure_target(struct ath10k *ar)
 		return ret;
 	}
 
+    ret = ath10k_bmi_write32(ar, hi_hci_uart_pwr_mgmt_params_ext, ar->dev_id);
+    if (ret) {
+        ath10k_err(ar, "failed to set pwr_mgmt_params: %d\n", ret);
+        return ret;
+    }
+
 	return 0;
 }
 

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
@@ -554,6 +554,7 @@ struct ath10k {
 	u8 mac_addr[ETH_ALEN];
 
 	enum ath10k_hw_rev hw_rev;
+    u16 dev_id;
 	u32 chip_id;
 	u32 target_version;
 	u8 fw_version_major;

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
@@ -58,7 +58,7 @@ MODULE_PARM_DESC(reset_mode, "0: auto, 1: warm only (default: 0)");
 #define ATH10K_PCI_NUM_WARM_RESET_ATTEMPTS 3
 
 #define QCA988X_2_0_DEVICE_ID	(0x003c)
-#define QCA6174_2_1_DEVICE_ID	(0x003e)
+#define QCA6174_2_1_DEVICE_ID	(0x0041)
 #define QCA99X0_2_0_DEVICE_ID	(0x0040)
 
 static const struct pci_device_id ath10k_pci_id_table[] = {
@@ -2922,6 +2922,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
 	ar_pci->pdev = pdev;
 	ar_pci->dev = &pdev->dev;
 	ar_pci->ar = ar;
+    ar->dev_id = pci_dev->device;
 
 	if (pdev->subsystem_vendor || pdev->subsystem_device)
 		scnprintf(ar->spec_board_id, sizeof(ar->spec_board_id),