Merge "qcacld-3.0: pass supported device id list to platform driver when loading" into wlan-cld3.driver.lnx.2.0.c2
diff --git a/Kbuild b/Kbuild
index ed473b9..e69054e 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2553,10 +2553,10 @@
# For OOB testing
cppflags-$(CONFIG_WLAN_FEATURE_WOW_PULSE) += -DWLAN_FEATURE_WOW_PULSE
+cppflags-$(CONFIG_AR6320_SUPPORT) += -DCONFIG_AR6320_SUPPORT
#Enable High Latency related Flags
ifeq ($(CONFIG_QCA_WIFI_SDIO), y)
-cppflags-y += -DCONFIG_AR6320_SUPPORT \
- -DSDIO_3_0 \
+cppflags-y += -DSDIO_3_0 \
-DHIF_SDIO \
-DCONFIG_DISABLE_CDC_MAX_PERF_WAR=0 \
-DCONFIG_ATH_PROCFS_DIAG_SUPPORT \
diff --git a/configs/qca6174_defconfig b/configs/qca6174_defconfig
index b36f6fe..ebca507 100644
--- a/configs/qca6174_defconfig
+++ b/configs/qca6174_defconfig
@@ -1,3 +1,5 @@
+CONFIG_AR6320_SUPPORT := y
+
ifeq ($(CONFIG_CLD_HL_SDIO_CORE), y)
CONFIG_QCA_WIFI_SDIO := y
ifndef CONFIG_SDIO_TRANSFER
diff --git a/core/pld/src/pld_pcie.c b/core/pld/src/pld_pcie.c
index 8f7cc04..5c2f512 100644
--- a/core/pld/src/pld_pcie.c
+++ b/core/pld/src/pld_pcie.c
@@ -491,11 +491,22 @@
#endif
static struct pci_device_id pld_pcie_id_table[] = {
- { 0x168c, 0x003c, PCI_ANY_ID, PCI_ANY_ID },
+#ifdef CONFIG_AR6320_SUPPORT
{ 0x168c, 0x003e, PCI_ANY_ID, PCI_ANY_ID },
+#elif defined(QCA_WIFI_QCA6290)
+ { 0x17cb, 0x1100, PCI_ANY_ID, PCI_ANY_ID },
+#elif defined(QCA_WIFI_QCA6390)
+ { 0x17cb, 0x1101, PCI_ANY_ID, PCI_ANY_ID },
+#elif defined(QCA_WIFI_QCA6490)
+ { 0x17cb, 0x1103, PCI_ANY_ID, PCI_ANY_ID },
+#elif defined(QCN7605_SUPPORT)
+ { 0x17cb, 0x1102, PCI_ANY_ID, PCI_ANY_ID },
+#else
+ { 0x168c, 0x003c, PCI_ANY_ID, PCI_ANY_ID },
{ 0x168c, 0x0041, PCI_ANY_ID, PCI_ANY_ID },
{ 0x168c, 0xabcd, PCI_ANY_ID, PCI_ANY_ID },
{ 0x168c, 0x7021, PCI_ANY_ID, PCI_ANY_ID },
+#endif
{ 0 }
};