diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index d6ed9ac56bf1..d4d355531169 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -16,7 +16,9 @@ config ARCH_MSMFALCON
 	select MULTI_IRQ_HANDLER
 	select HAVE_ARM_ARCH_TIMER
 	select MAY_HAVE_SPARSE_IRQ
-	select COMMON_CLK_MSM
+	select COMMON_CLK
+	select COMMON_CLK_QCOM
+	select QCOM_GDSC
 	select PINCTRL_MSM_TLMM
 	select USE_PINCTRL_IRQ
 	select MSM_PM if PM
@@ -31,6 +33,7 @@ config ARCH_MSMFALCON
 	select MSM_QDSP6V2_CODECS
 	select MSM_AUDIO_QDSP6V2 if SND_SOC
 	select MSM_RPM_SMD
+	select GENERIC_IRQ_MIGRATION
 	select MSM_JTAGV8 if CORESIGHT_ETMV4
 	help
 	This enables support for the MSMFALCON chipset. If you do not
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index ee4efe58d0c8..94c0bf30c284 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -89,7 +89,9 @@ config ARCH_MSMHAMSTER
 config ARCH_MSMFALCON
 	bool "Enable Support for Qualcomm Technologies Inc MSMFALCON"
 	depends on ARCH_QCOM
-	select COMMON_CLK_MSM
+	select COMMON_CLK
+	select COMMON_CLK_QCOM
+	select QCOM_GDSC
 	help
 	  This enables support for the MSMFALCON chipset.
 	  If you do not wish to build a kernel that runs
@@ -98,7 +100,9 @@ config ARCH_MSMFALCON
 config ARCH_MSMTRITON
 	bool "Enable Support for Qualcomm Technologies Inc MSMTRITON"
 	depends on ARCH_QCOM
-	select COMMON_CLK_MSM
+	select COMMON_CLK
+	select COMMON_CLK_QCOM
+	select QCOM_GDSC
 	help
 	  This enables support for the MSMTRITON chipset.
 	  If you do not wish to build a kernel that runs
diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig
index 50c8848bc6f9..a31d004ed349 100644
--- a/arch/arm64/configs/msmcortex-perf_defconfig
+++ b/arch/arm64/configs/msmcortex-perf_defconfig
@@ -44,7 +44,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_MSMCOBALT=y
 CONFIG_ARCH_MSMHAMSTER=y
-CONFIG_ARCH_MSMFALCON=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
 CONFIG_SCHED_MC=y
diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig
index 3d1a01491c0c..3f505fd4a010 100644
--- a/arch/arm64/configs/msmcortex_defconfig
+++ b/arch/arm64/configs/msmcortex_defconfig
@@ -45,7 +45,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_MSMCOBALT=y
 CONFIG_ARCH_MSMHAMSTER=y
-CONFIG_ARCH_MSMFALCON=y
 CONFIG_PCI=y
 CONFIG_PCI_MSM=y
 CONFIG_SCHED_MC=y
diff --git a/arch/arm64/configs/msmfalcon-perf_defconfig b/arch/arm64/configs/msmfalcon-perf_defconfig
index 6ebd60b43c71..e35373c36a3a 100644
--- a/arch/arm64/configs/msmfalcon-perf_defconfig
+++ b/arch/arm64/configs/msmfalcon-perf_defconfig
@@ -41,8 +41,6 @@ CONFIG_MODULE_SIG_FORCE=y
 CONFIG_MODULE_SIG_SHA512=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_MSMCOBALT=y
-CONFIG_ARCH_MSMHAMSTER=y
 CONFIG_ARCH_MSMFALCON=y
 CONFIG_ARCH_MSMTRITON=y
 CONFIG_PCI=y
@@ -476,7 +474,6 @@ CONFIG_RMNET_IPA3=y
 CONFIG_GPIO_USB_DETECT=y
 CONFIG_SEEMP_CORE=y
 CONFIG_USB_BAM=y
-CONFIG_MSM_MDSS_PLL=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_ARM_SMMU=y
diff --git a/arch/arm64/configs/msmfalcon_defconfig b/arch/arm64/configs/msmfalcon_defconfig
index 01324d89e79e..7b0eb496b930 100644
--- a/arch/arm64/configs/msmfalcon_defconfig
+++ b/arch/arm64/configs/msmfalcon_defconfig
@@ -42,8 +42,6 @@ CONFIG_MODULE_SIG_SHA512=y
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_MSMCOBALT=y
-CONFIG_ARCH_MSMHAMSTER=y
 CONFIG_ARCH_MSMFALCON=y
 CONFIG_ARCH_MSMTRITON=y
 CONFIG_PCI=y
@@ -486,7 +484,6 @@ CONFIG_RMNET_IPA3=y
 CONFIG_GPIO_USB_DETECT=y
 CONFIG_SEEMP_CORE=y
 CONFIG_USB_BAM=y
-CONFIG_MSM_MDSS_PLL=y
 CONFIG_REMOTE_SPINLOCK_MSM=y
 CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST=y
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index f237a2188fe1..f580a1048d65 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -136,7 +136,9 @@ snd-soc-wcd9335-objs := wcd9335.o
 snd-soc-wcd934x-objs := wcd934x.o
 snd-soc-wcd9xxx-objs := wcd9xxx-resmgr.o wcd9xxx-mbhc.o wcd9xxx-common.o wcdcal-hwdep.o
 snd-soc-wcd9xxx-v2-objs := wcd9xxx-common-v2.o wcd9xxx-resmgr-v2.o
-audio-ext-clock-objs := audio-ext-clk.o
+ifeq ($(CONFIG_COMMON_CLK_MSM), y)
+	audio-ext-clock-objs := audio-ext-clk.o
+endif
 snd-soc-wcd-cpe-objs := wcd_cpe_services.o wcd_cpe_core.o
 snd-soc-wsa881x-objs := wsa881x.o wsa881x-tables.o wsa881x-regmap.o wsa881x-temp-sensor.o
 snd-soc-wcd-mbhc-objs := wcd-mbhc-v2.o
@@ -344,7 +346,9 @@ obj-$(CONFIG_SND_SOC_WCD9320)	+= snd-soc-wcd9320.o
 obj-$(CONFIG_SND_SOC_WCD9330)	+= snd-soc-wcd9330.o
 obj-$(CONFIG_SND_SOC_WCD9335)	+= snd-soc-wcd9335.o
 obj-$(CONFIG_SND_SOC_WCD934X)	+= wcd934x/
-obj-$(CONFIG_AUDIO_EXT_CLK)	+= audio-ext-clock.o
+ifeq ($(CONFIG_COMMON_CLK_MSM), y)
+	obj-$(CONFIG_AUDIO_EXT_CLK)	+= audio-ext-clock.o
+endif
 obj-$(CONFIG_SND_SOC_WCD9XXX)   += snd-soc-wcd9xxx.o
 obj-$(CONFIG_SND_SOC_WCD9XXX_V2) += snd-soc-wcd9xxx-v2.o
 obj-$(CONFIG_SND_SOC_WCD_CPE)   += snd-soc-wcd-cpe.o