Config improvements for Qualcomm devices

56 files changed, 123 insertions, 93 deletions

diff --git a/baseconfig/CONFIG_BT_QCOMSMD b/baseconfig/CONFIG_BT_QCOMSMD
deleted file mode 100644
index d67bc39b0..000000000
--- a/baseconfig/CONFIG_BT_QCOMSMD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BT_QCOMSMD is not set
diff --git a/baseconfig/CONFIG_PINCTRL_MSM8994 b/baseconfig/CONFIG_PINCTRL_MSM8994
index 5dd58e746..977b1c3c4 100644
--- a/baseconfig/CONFIG_PINCTRL_MSM8994
+++ b/baseconfig/CONFIG_PINCTRL_MSM8994
@@ -1 +1 @@
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
diff --git a/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084 b/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084
index 5ce9e62f4..bacb61e5e 100644
--- a/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084
+++ b/baseconfig/arm/arm64/CONFIG_APQ_GCC_8084
@@ -1 +1 @@
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
diff --git a/baseconfig/arm/arm64/CONFIG_BT_QCOMSMD b/baseconfig/arm/arm64/CONFIG_BT_QCOMSMD
new file mode 100644
index 000000000..9f36fb6a8
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_BT_QCOMSMD
@@ -0,0 +1 @@
+CONFIG_BT_QCOMSMD=m
diff --git a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM
index ec4000095..2b7c64357 100644
--- a/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM
+++ b/baseconfig/arm/arm64/CONFIG_COMMON_CLK_QCOM
@@ -1 +1 @@
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI
index e305e243b..87b627906 100644
--- a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI
@@ -1 +1 @@
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_14NM_PHY b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_14NM_PHY
new file mode 100644
index 000000000..397f69094
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_14NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_20NM_PHY b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_20NM_PHY
new file mode 100644
index 000000000..7595ae205
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_20NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
new file mode 100644
index 000000000..5d86a4597
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_PHY b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_PHY
new file mode 100644
index 000000000..ea1c4f918
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_28NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_PLL b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_PLL
new file mode 100644
index 000000000..16ac280e6
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MSM_DSI_PLL
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_PLL=y
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660 b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660
index 457d918ff..9effe8611 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660
+++ b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8660
@@ -1 +1 @@
-CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8660=y
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916 b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916
index f65dc3662..87cf3fd89 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916
+++ b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8916
@@ -1 +1 @@
-# CONFIG_MSM_GCC_8916 is not set
+CONFIG_MSM_GCC_8916=y
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960 b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960
index a492a6821..03ba44b34 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960
+++ b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8960
@@ -1 +1 @@
-CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_GCC_8960=y
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974 b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974
index 62f48a9e8..8ffbd8055 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974
+++ b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8974
@@ -1 +1 @@
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8974=y
diff --git a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996 b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996
index 166ddcce5..4b01d318d 100644
--- a/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996
+++ b/baseconfig/arm/arm64/CONFIG_MSM_GCC_8996
@@ -1 +1 @@
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
diff --git a/baseconfig/arm/arm64/CONFIG_RPMSG b/baseconfig/arm/arm64/CONFIG_RPMSG
new file mode 100644
index 000000000..7cc8785d0
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_RPMSG
@@ -0,0 +1 @@
+CONFIG_RPMSG=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
new file mode 100644
index 000000000..207a5e523
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL b/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
new file mode 100644
index 000000000..db12f036e
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084 b/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084
index 5ce9e62f4..bacb61e5e 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084
+++ b/baseconfig/arm/armv7/armv7/CONFIG_APQ_GCC_8084
@@ -1 +1 @@
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD b/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD
new file mode 100644
index 000000000..9f36fb6a8
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_BT_QCOMSMD
@@ -0,0 +1 @@
+CONFIG_BT_QCOMSMD=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM b/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
index ec4000095..2b7c64357 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
+++ b/baseconfig/arm/armv7/armv7/CONFIG_COMMON_CLK_QCOM
@@ -1 +1 @@
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
index e305e243b..87b627906 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI
@@ -1 +1 @@
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY
new file mode 100644
index 000000000..397f69094
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_14NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY
new file mode 100644
index 000000000..7595ae205
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_20NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
new file mode 100644
index 000000000..5d86a4597
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_8960_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY
new file mode 100644
index 000000000..ea1c4f918
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_28NM_PHY
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL
new file mode 100644
index 000000000..16ac280e6
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_DRM_MSM_DSI_PLL
@@ -0,0 +1 @@
+CONFIG_DRM_MSM_DSI_PLL=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660
index 457d918ff..9effe8611 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8660
@@ -1 +1 @@
-CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8660=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960
index a492a6821..03ba44b34 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8960
@@ -1 +1 @@
-CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_GCC_8960=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974
index 62f48a9e8..8ffbd8055 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8974
@@ -1 +1 @@
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8974=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996 b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996
index 166ddcce5..4b01d318d 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MSM_GCC_8996
@@ -1 +1 @@
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_RPMSG b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG
new file mode 100644
index 000000000..7cc8785d0
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_RPMSG
@@ -0,0 +1 @@
+CONFIG_RPMSG=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
new file mode 100644
index 000000000..f862f05a7
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_ANALOG
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MSM8916_WCD_ANALOg=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
new file mode 100644
index 000000000..db12f036e
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_MSM8916_WCD_DIGITAL
@@ -0,0 +1 @@
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 6e01e68d1..998d239fe 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -194,7 +194,7 @@ CONFIG_APDS9802ALS=m
 CONFIG_APM_POWER=m
 # CONFIG_APPLE_PROPERTIES is not set
 # CONFIG_APPLICOM is not set
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
@@ -662,7 +662,7 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
+CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -874,7 +874,7 @@ CONFIG_COMMON_CLK_HI6220=y
 CONFIG_COMMON_CLK_HI655X=m
 CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SCPI=m
 # CONFIG_COMMON_CLK_SI514 is not set
@@ -1265,7 +1265,12 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
@@ -3139,12 +3144,12 @@ CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
-CONFIG_MSM_GCC_8660=m
-# CONFIG_MSM_GCC_8916 is not set
-CONFIG_MSM_GCC_8960=m
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8660=y
+CONFIG_MSM_GCC_8916=y
+CONFIG_MSM_GCC_8960=y
+CONFIG_MSM_GCC_8974=y
 # CONFIG_MSM_GCC_8994 is not set
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MSM_MMCC_8960=m
 CONFIG_MSM_MMCC_8974=m
@@ -4000,7 +4005,7 @@ CONFIG_PINCTRL_MAX77620=m
 # CONFIG_PINCTRL_MSM8660 is not set
 CONFIG_PINCTRL_MSM8916=y
 # CONFIG_PINCTRL_MSM8960 is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_MSM8996=y
 # CONFIG_PINCTRL_MSM8X74 is not set
 CONFIG_PINCTRL_MSM=y
@@ -4348,6 +4353,7 @@ CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
@@ -5146,8 +5152,8 @@ CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX98927=m
-# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 CONFIG_SND_SOC_NAU8824=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 27cb78ee2..11dab5c5d 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -194,7 +194,7 @@ CONFIG_APDS9802ALS=m
 CONFIG_APM_POWER=m
 # CONFIG_APPLE_PROPERTIES is not set
 # CONFIG_APPLICOM is not set
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
@@ -662,7 +662,7 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
+CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -874,7 +874,7 @@ CONFIG_COMMON_CLK_HI6220=y
 CONFIG_COMMON_CLK_HI655X=m
 CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SCPI=m
 # CONFIG_COMMON_CLK_SI514 is not set
@@ -1255,7 +1255,12 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
@@ -3118,12 +3123,12 @@ CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
-CONFIG_MSM_GCC_8660=m
-# CONFIG_MSM_GCC_8916 is not set
-CONFIG_MSM_GCC_8960=m
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8660=y
+CONFIG_MSM_GCC_8916=y
+CONFIG_MSM_GCC_8960=y
+CONFIG_MSM_GCC_8974=y
 # CONFIG_MSM_GCC_8994 is not set
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MSM_MMCC_8960=m
 CONFIG_MSM_MMCC_8974=m
@@ -3979,7 +3984,7 @@ CONFIG_PINCTRL_MAX77620=m
 # CONFIG_PINCTRL_MSM8660 is not set
 CONFIG_PINCTRL_MSM8916=y
 # CONFIG_PINCTRL_MSM8960 is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_MSM8996=y
 # CONFIG_PINCTRL_MSM8X74 is not set
 CONFIG_PINCTRL_MSM=y
@@ -4326,6 +4331,7 @@ CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
@@ -5123,8 +5129,8 @@ CONFIG_SND_SOC=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX98927=m
-# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 CONFIG_SND_SOC_NAU8824=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index c43cfe8a7..dc29d9014 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -177,7 +177,7 @@ CONFIG_APDS9802ALS=m
 CONFIG_APM_POWER=m
 # CONFIG_APPLE_PROPERTIES is not set
 # CONFIG_APPLICOM is not set
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
@@ -706,7 +706,7 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
+CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -920,7 +920,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -1356,7 +1356,12 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
@@ -3355,12 +3360,12 @@ CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
-CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8660=y
 # CONFIG_MSM_GCC_8916 is not set
-CONFIG_MSM_GCC_8960=m
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8960=y
+CONFIG_MSM_GCC_8974=y
 # CONFIG_MSM_GCC_8994 is not set
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
 # CONFIG_MSM_IOMMU is not set
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MSM_MMCC_8960=m
@@ -4306,7 +4311,7 @@ CONFIG_PINCTRL_IMX6SL=y
 CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8960=m
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MVEBU=y
@@ -4694,6 +4699,7 @@ CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
@@ -5577,7 +5583,8 @@ CONFIG_SND_SOC_MAX98090=m
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_MSM8916_WCD_ANALOg=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 CONFIG_SND_SOC_NAU8824=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index b080a6628..e8a5feb8b 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -684,7 +684,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -4082,7 +4081,7 @@ CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_SAMSUNG=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index ffe0780ff..4119ecd40 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -683,7 +683,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -4061,7 +4060,7 @@ CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_SAMSUNG=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 98ddad80f..c3dc22050 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -177,7 +177,7 @@ CONFIG_APDS9802ALS=m
 CONFIG_APM_POWER=m
 # CONFIG_APPLE_PROPERTIES is not set
 # CONFIG_APPLICOM is not set
-CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_GCC_8084=y
 CONFIG_APQ_MMCC_8084=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AR5523=m
@@ -705,7 +705,7 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
+CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -919,7 +919,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_QCOM=m
+CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -1346,7 +1346,12 @@ CONFIG_DRM_MALI_DISPLAY=m
 CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
-# CONFIG_DRM_MSM_DSI is not set
+CONFIG_DRM_MSM_DSI_14NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI=y
 CONFIG_DRM_MSM_HDMI_HDCP=y
 CONFIG_DRM_MSM=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set
@@ -3334,12 +3339,12 @@ CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
-CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8660=y
 # CONFIG_MSM_GCC_8916 is not set
-CONFIG_MSM_GCC_8960=m
-CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_GCC_8960=y
+CONFIG_MSM_GCC_8974=y
 # CONFIG_MSM_GCC_8994 is not set
-CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_GCC_8996=y
 # CONFIG_MSM_IOMMU is not set
 # CONFIG_MSM_LCC_8960 is not set
 CONFIG_MSM_MMCC_8960=m
@@ -4285,7 +4290,7 @@ CONFIG_PINCTRL_IMX6SL=y
 CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8960=m
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_MVEBU=y
@@ -4672,6 +4677,7 @@ CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPMSG_CHAR is not set
+CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_SMD=m
 CONFIG_RPR0521=m
 CONFIG_RSI_91X=m
@@ -5554,7 +5560,8 @@ CONFIG_SND_SOC_MAX98090=m
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
-# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
+CONFIG_SND_SOC_MSM8916_WCD_ANALOg=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 CONFIG_SND_SOC_NAU8824=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index cdfe4bb3b..fa49266c6 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -577,7 +577,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3846,7 +3845,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index d88af7089..2f7b0c57e 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -578,7 +578,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3866,7 +3865,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 05b44a313..e937d8035 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -578,7 +578,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3866,7 +3865,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index c5809f722..ededfcd78 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -577,7 +577,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3846,7 +3845,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 730f42718..783d4877a 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -564,7 +564,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3662,7 +3661,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index d39d94c84..5a433cfee 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -563,7 +563,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3640,7 +3639,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 61fa7665a..27e381b45 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -521,7 +521,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3605,7 +3604,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index fe131a436..4c8de78e8 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -520,7 +520,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3583,7 +3582,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 477c51d42..dfda11eee 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -521,7 +521,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3604,7 +3603,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 7a5f05022..f374e959b 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -520,7 +520,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3582,7 +3581,7 @@ CONFIG_PHYLIB=y
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 37e00a8bd..0901700cb 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -520,7 +520,6 @@ CONFIG_BT_LE=y
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3533,7 +3532,7 @@ CONFIG_PHYLIB=m
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 21726a5ed..b9c1f6c30 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -519,7 +519,6 @@ CONFIG_BT_LE=y
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3511,7 +3510,7 @@ CONFIG_PHYLIB=m
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 9f52fa0de..b74513e94 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -586,7 +586,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3906,7 +3905,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 14a5f1e8e..75f938ea5 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -585,7 +585,6 @@ CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_QCA=m
-# CONFIG_BT_QCOMSMD is not set
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
@@ -3886,7 +3885,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CHERRYVIEW=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_MSM8994=m
+# CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_SUNRISEPOINT=m
 # CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_TI_IODELAY is not set
diff --git a/kernel.spec b/kernel.spec
index 658b4a198..35e09fcbe 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2193,6 +2193,9 @@ fi
 #
 #
 %changelog
+* Mon Jun 26 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Config improvements for Qualcomm devices
+
 * Mon Jun 26 2017 Laura Abbott <labbott@fedoraproject.org> - 4.12.0-0.rc7.git0.1
 - Linux v4.12-rc7
 - Make CONFIG_SERIAL_8250_PCI built in (rhbz 1464709)