diff --git a/config-arm-generic b/config-arm-generic
index 3c5a9eb1b..ff4b0fb61 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -170,6 +170,15 @@ CONFIG_SND_HDA_TEGRA=m
 # CONFIG_ARM_TEGRA20_CPUFREQ is not set
 # CONFIG_MFD_NVEC is not set
 
+# Qualcomm - Don't currently support IPQ router devices
+# CONFIG_IPQ_GCC_806X is not set
+# CONFIG_IPQ_LCC_806X is not set
+# CONFIG_IPQ_GCC_4019 is not st
+# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+# CONFIG_DWMAC_IPQ806X is not set
+# CONFIG_PINCTRL_IPQ8064 is not set
+# CONFIG_PINCTRL_IPQ4019 is not set
+
 # Virt
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
diff --git a/config-armv7 b/config-armv7
index c3d64fafb..02c33c81d 100644
--- a/config-armv7
+++ b/config-armv7
@@ -277,7 +277,6 @@ CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_PINCTRL_APQ8064=m
 CONFIG_PINCTRL_APQ8084=m
-CONFIG_PINCTRL_IPQ8064=m
 CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8960=m
 CONFIG_PINCTRL_MSM8X74=m
@@ -286,7 +285,6 @@ CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
 CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
 CONFIG_COMMON_CLK_QCOM=m
 # CONFIG_MSM_GCC_8916 is not set
-# CONFIG_IPQ_LCC_806X is not set
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MFD_QCOM_RPM=m
 CONFIG_MFD_PM8921_CORE=m
@@ -294,8 +292,6 @@ CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
-CONFIG_IPQ_GCC_806X=m
-CONFIG_IPQ_GCC_4019=m
 CONFIG_MSM_GCC_8660=m
 CONFIG_MSM_GCC_8960=m
 CONFIG_MSM_MMCC_8960=m
@@ -314,8 +310,7 @@ CONFIG_QCOM_BAM_DMA=m
 CONFIG_QCOM_GSBI=m
 CONFIG_QCOM_PM=y
 CONFIG_PHY_QCOM_APQ8064_SATA=m
-CONFIG_PHY_QCOM_IPQ806X_SATA=m
-CONFIG_DWMAC_IPQ806X=m
+CONFIG_USB_DWC3_QCOM=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set 
diff --git a/config-armv7-generic b/config-armv7-generic
index 3e9afc353..af1652c4a 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -514,11 +514,9 @@ CONFIG_MFD_TPS65912_SPI=y
 # CONFIG_PINCTRL_BCM281XX is not set
 # CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_APQ8084 is not set
-# CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_MSM8960 is not set
 # CONFIG_PINCTRL_MSM8660 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
-# CONFIG_PINCTRL_IPQ4019 is not set
 
 # GPIO
 # CONFIG_GPIO_EM is not set
@@ -760,7 +758,6 @@ CONFIG_CROS_EC_PROTO=y
 # This newly introduced mess needs to be fixed upstream :-(
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
-# CONFIG_DWMAC_IPQ806X is not set
 # CONFIG_DWMAC_LPC18XX is not set
 # CONFIG_DWMAC_MESON is not set
 # CONFIG_DWMAC_SOCFPGA is not set