diff --git a/configs/genoa.pci.debug_defconfig b/configs/genoa.pci.debug_defconfig
index 0f4a6fa980b6..466c0bcd9694 100644
--- a/configs/genoa.pci.debug_defconfig
+++ b/configs/genoa.pci.debug_defconfig
@@ -111,6 +111,13 @@ CONFIG_PLD_PCIE_INIT_FLAG := y
 endif
 endif
 
+ifeq ($(CONFIG_CNSS2), m)
+ifeq ($(CONFIG_HIF_PCI), y)
+CONFIG_PLD_PCIE_CNSS_FLAG := y
+CONFIG_PLD_PCIE_INIT_FLAG := y
+endif
+endif
+
 CONFIG_QCA_WIFI_FTM := y
 ifeq ($(CONFIG_NL80211_TESTMODE), y)
 	QCA_WIFI_FTM_NL80211 :=y
diff --git a/configs/qca6174_defconfig b/configs/qca6174_defconfig
index bb38ece59426..1720d30e4ed5 100644
--- a/configs/qca6174_defconfig
+++ b/configs/qca6174_defconfig
@@ -20,6 +20,13 @@ ifndef CONFIG_ROME_IF
 endif
 endif
 
+ifeq (m,$(findstring m,$(CONFIG_CNSS) $(CONFIG_CNSS2)))
+ifndef CONFIG_ROME_IF
+	#use pci as default interface
+	CONFIG_ROME_IF = pci
+endif
+endif
+
 # Make WLAN as open-source driver by default
 WLAN_OPEN_SOURCE := y
 
@@ -137,6 +144,17 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),)
 		CONFIG_WLAN_FEATURE_LPSS := y
 		endif
 	endif
+
+	ifeq (m,$(findstring m,$(CONFIG_CNSS2)))
+	#Flag to enable Protected Management Frames (11w) feature
+	CONFIG_WLAN_FEATURE_11W := y
+	#Flag to enable LTE CoEx feature
+	CONFIG_QCOM_LTE_COEX := y
+		ifneq ($(CONFIG_MOBILE_ROUTER), y)
+		#Flag to enable LPSS feature
+		CONFIG_WLAN_FEATURE_LPSS := y
+		endif
+	endif
 endif
 
 #Flag to enable Protected Management Frames (11w) feature
@@ -705,6 +723,13 @@ CONFIG_PLD_PCIE_INIT_FLAG := y
 endif
 endif
 
+ifeq ($(CONFIG_CNSS2), m)
+ifeq ($(CONFIG_HIF_PCI), y)
+CONFIG_PLD_PCIE_CNSS_FLAG := y
+CONFIG_PLD_PCIE_INIT_FLAG := y
+endif
+endif
+
 #Enable STATE MACHINE HISTORY
 CONFIG_SM_ENG_HIST := n
 
diff --git a/configs/qca6390_defconfig b/configs/qca6390_defconfig
index 80082ff374e6..cb304bad7208 100644
--- a/configs/qca6390_defconfig
+++ b/configs/qca6390_defconfig
@@ -45,6 +45,13 @@ ifndef CONFIG_ROME_IF
 endif
 endif
 
+ifeq (m,$(findstring m,$(CONFIG_CNSS) $(CONFIG_CNSS2)))
+ifndef CONFIG_ROME_IF
+	#use pci as default interface
+	CONFIG_ROME_IF = pci
+endif
+endif
+
 # Make WLAN as open-source driver by default
 WLAN_OPEN_SOURCE := y
 
@@ -162,6 +169,17 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),)
 		CONFIG_WLAN_FEATURE_LPSS := y
 		endif
 	endif
+
+	ifeq (m,$(findstring m,$(CONFIG_CNSS2)))
+	#Flag to enable Protected Management Frames (11w) feature
+	CONFIG_WLAN_FEATURE_11W := y
+	#Flag to enable LTE CoEx feature
+	CONFIG_QCOM_LTE_COEX := y
+		ifneq ($(CONFIG_MOBILE_ROUTER), y)
+		#Flag to enable LPSS feature
+		CONFIG_WLAN_FEATURE_LPSS := y
+		endif
+	endif
 endif
 
 #Flag to enable Protected Management Frames (11w) feature
@@ -745,6 +763,13 @@ CONFIG_PLD_PCIE_INIT_FLAG := y
 endif
 endif
 
+ifeq ($(CONFIG_CNSS2), m)
+ifeq ($(CONFIG_HIF_PCI), y)
+CONFIG_PLD_PCIE_CNSS_FLAG := y
+CONFIG_PLD_PCIE_INIT_FLAG := y
+endif
+endif
+
 #Enable STATE MACHINE HISTORY
 CONFIG_SM_ENG_HIST := n