diff --git a/sound/soc/tegra-alt/Kconfig b/sound/soc/tegra-alt/Kconfig
index d3792609..759dfe97 100644
--- a/sound/soc/tegra-alt/Kconfig
+++ b/sound/soc/tegra-alt/Kconfig
@@ -17,13 +17,6 @@ config SND_SOC_TEGRA186_ARAD_ALT
 	tristate
 	depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_186
 
-config SND_SOC_TEGRA_ALT_FORCE_CARD_REG
-	tristate "Enable sound card even if audio codec is missing on board"
-	depends on SND_SOC_TEGRA_ALT
-	help
-	  Say Y or M if you want to register the sound card even if audio codec
-	  is not connected/present on board.
-
 config SND_SOC_TEGRA_T186REF_P4573_ALT
 	tristate "SoC Audio support for P4573 with CS53L30 and RT5658"
 	depends on SND_SOC_TEGRA_T186REF_ALT
@@ -135,29 +128,6 @@ config DISABLE_ADSP_AUDIO
 	help
 	 Say Y if you want to disable support for Tegra210 ADSP module
 
-config SND_SOC_TEGRA_ASOC_MACHINE_ALT
-	tristate
-	depends on SND_SOC_TEGRA_ALT
-
-config SND_SOC_TEGRA_T210REF_MOBILE_ALT
-	tristate "SoC Audio support for T210Ref mobile"
-	depends on SND_SOC_TEGRA_ALT && I2C
-	depends on ARCH_TEGRA_210_SOC
-	select SND_SOC_TEGRA210_XBAR_ALT
-	select SND_SOC_TEGRA210_PCM_ALT
-	select SND_SOC_TEGRA210_ADMA_ALT
-	select SND_SOC_TEGRA210_ADMAIF_ALT
-	select SND_SOC_TEGRA210_I2S_ALT
-	select SND_SOC_TEGRA210_MIXER_ALT
-	select SND_SOC_TEGRA210_SFC_ALT
-	select SND_SOC_SPDIF
-	select SND_SOC_RT5640
-	select SND_SOC_RT5659
-	select SND_SOC_SGTL5000
-	select SND_SOC_TEGRA_ASOC_MACHINE_ALT
-	help
-	  Say Y or M here.
-
 config SND_SOC_TEGRA_T210REF_ALT
 	tristate "SoC Audio support for T210Ref"
 	depends on SND_SOC_TEGRA_ALT
@@ -179,7 +149,6 @@ config SND_SOC_TEGRA_T210REF_ALT
 	select SND_SOC_TEGRA_ASOC_HWDEP_ALT
 	select SND_SOC_SPDIF
 	select SND_SOC_AD193X_I2C
-	select SND_SOC_TEGRA_ASOC_MACHINE_ALT
 	help
 	  Say Y or M here.
 
@@ -206,18 +175,39 @@ config SND_SOC_TEGRA_T186REF_ALT
 	select SND_SOC_TEGRA186_DSPK_ALT
 	select SND_SOC_TEGRA_ASOC_HWDEP_ALT
 	select SND_SOC_SPDIF
-	select SND_SOC_TEGRA_ASOC_MACHINE_ALT
 	select SND_SOC_COMPRESS
 	help
 	  Say Y or M here.
 
-config SND_SOC_TEGRA_T186REF_MOBILE_ALT
-	tristate "SoC Audio support for T186Ref Mobile"
-	depends on SND_SOC_TEGRA_T186REF_ALT
+config SND_SOC_TEGRA210_AUDIO_ALT
+	tristate "SoC Audio support for Tegra210"
+	depends on I2C
+	depends on ARCH_TEGRA_210_SOC || ARCH_TEGRA_18x_SOC
+	select SND_SOC_TEGRA210_XBAR_ALT
+	select SND_SOC_TEGRA210_PCM_ALT
+	select SND_SOC_TEGRA210_ADMA_ALT
+	select SND_SOC_TEGRA210_ADMAIF_ALT
+	select SND_SOC_TEGRA210_I2S_ALT
+	select SND_SOC_TEGRA210_DMIC_ALT
+	select SND_SOC_TEGRA210_AMX_ALT
+	select SND_SOC_TEGRA210_ADX_ALT
+	select SND_SOC_TEGRA210_MIXER_ALT
+	select SND_SOC_TEGRA210_SFC_ALT
+	select SND_SOC_TEGRA210_AFC_ALT
+	select SND_SOC_TEGRA210_MVC_ALT
+	select SND_SOC_TEGRA210_OPE_ALT
+	select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP && !DISABLE_ADSP_AUDIO
+	select SND_SOC_TEGRA186_ASRC_ALT if ARCH_TEGRA_18x_SOC
+	select SND_SOC_TEGRA186_ARAD_ALT if ARCH_TEGRA_18x_SOC
+	select SND_SOC_TEGRA186_DSPK_ALT if ARCH_TEGRA_18x_SOC
+	select SND_SOC_SPDIF
+	select SND_SOC_COMPRESS
+	select SND_SOC_RT5640
 	select SND_SOC_RT5659
 	select SND_SOC_SGTL5000
 	help
-	  Say Y or M here.
+	  Say Y or M here if you want to enable support for ASoC machine driver on
+	  Tegra210 and successor platforms like Tegra186, Tegra194.
 
 config SND_SOC_TEGRA_T210REF_P2382_ALT
 	tristate "SoC Audio support for P2382Ref T210"
@@ -238,7 +228,6 @@ config SND_SOC_TEGRA_T210REF_P2382_ALT
 	select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP && !DISABLE_ADSP_AUDIO
 	select SND_SOC_TEGRA_ASOC_HWDEP_ALT
 	select SND_SOC_SPDIF
-	select SND_SOC_TEGRA_ASOC_MACHINE_ALT
 	help
 	  Say Y or M here
 
diff --git a/sound/soc/tegra-alt/Makefile b/sound/soc/tegra-alt/Makefile
index 103c3139..144bd0c1 100644
--- a/sound/soc/tegra-alt/Makefile
+++ b/sound/soc/tegra-alt/Makefile
@@ -71,7 +71,6 @@ obj-$(CONFIG_SND_SOC_TEGRA_P1889REF_ALT)	+= snd-soc-tegra-alt-p1889ref.o
 obj-$(CONFIG_SND_SOC_TEGRA_T210REF_ALT)		+= snd-soc-tegra-alt-t210ref.o
 obj-$(CONFIG_SND_SOC_TEGRA_T210REF_P2382_ALT)	+= snd-soc-tegra-alt-t210ref-p2382.o
 obj-$(CONFIG_SND_SOC_TEGRA_T186REF_FPGA_ALT)	+= snd-soc-tegra-alt-t186ref.o
-obj-$(CONFIG_SND_SOC_TEGRA_T210REF_MOBILE_ALT)	+= snd-soc-tegra-machine-driver-mobile.o
-obj-$(CONFIG_SND_SOC_TEGRA_T186REF_MOBILE_ALT)	+= snd-soc-tegra-machine-driver-mobile.o
+obj-$(CONFIG_SND_SOC_TEGRA210_AUDIO_ALT)          += snd-soc-tegra-machine-driver-mobile.o
 obj-$(CONFIG_SND_SOC_TEGRA_T186REF_AUTO_ALT)	+= snd-soc-tegra-alt-t186ref-p2382.o
 obj-$(CONFIG_SND_SOC_TEGRA_T186REF_P4573_ALT)	+= snd-soc-tegra-alt-t186ref-p4573.o