diff --git a/sound/soc/tegra-alt/Kconfig b/sound/soc/tegra-alt/Kconfig
index 3e7e4b62..cbefea44 100644
--- a/sound/soc/tegra-alt/Kconfig
+++ b/sound/soc/tegra-alt/Kconfig
@@ -18,6 +18,11 @@ config SND_SOC_TEGRA_ALT_114_OR_LATER
 	depends on SND_SOC_TEGRA_ALT
 	depends on ARCH_TEGRA_11x_SOC || ARCH_TEGRA_12x_SOC
 
+config SND_SOC_TEGRA_ALT_124
+	def_bool y
+	depends on SND_SOC_TEGRA_ALT
+	depends on ARCH_TEGRA_12x_SOC
+
 config SND_SOC_TEGRA_ALT_210
 	def_bool y
 	depends on SND_SOC_TEGRA_ALT
@@ -53,6 +58,12 @@ config SND_SOC_TEGRA30_I2S_ALT
 	help
 	  Say Y or M if you want to add support for Tegra30 I2S module.
 
+config SND_SOC_TEGRA30_DAM_ALT
+	tristate "Tegra30 DAM driver"
+	depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_30_OR_LATER
+	help
+	  Say Y or M if you want to add support for Tegra30 DAM module.
+
 config SND_SOC_TEGRA30_SPDIF_ALT
 	tristate "Tegra30 SPDIF driver"
 	depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_30_OR_LATER
@@ -71,6 +82,12 @@ config SND_SOC_TEGRA114_ADX_ALT
 	help
 	  Say Y or M if you want to add support for Tegra114 ADX module.
 
+config SND_SOC_TEGRA124_AFC_ALT
+	tristate "Tegra124 AFC driver"
+	depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_124
+	help
+	  Say Y or M if you want to add support for Tegra124 AFC module.
+
 config SND_SOC_TEGRA210_I2S_ALT
 	tristate "Tegra210 I2S driver"
 	depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210
@@ -126,9 +143,11 @@ config SND_SOC_TEGRA_VCM30T124_ALT
 	select SND_SOC_TEGRA30_XBAR_ALT
 	select SND_SOC_TEGRA30_APBIF_ALT
 	select SND_SOC_TEGRA30_I2S_ALT
+	select SND_SOC_TEGRA30_DAM_ALT
+	select SND_SOC_TEGRA30_SPDIF_ALT
 	select SND_SOC_TEGRA114_AMX_ALT
 	select SND_SOC_TEGRA114_ADX_ALT
-	select SND_SOC_TEGRA30_SPDIF_ALT
+	select SND_SOC_TEGRA124_AFC_ALT
 	select SND_SOC_AD193X
 	select SND_SOC_WM8731
 	select SND_SOC_SPDIF
@@ -141,6 +160,7 @@ config SND_SOC_TEGRA_VCM30T124_ALT
 config SND_SOC_TEGRA_GRENADA_ALT
 	tristate "SoC Audio support for GRENADA"
 	depends on SND_SOC_TEGRA_ALT
+	depends on MACH_GRENADA
 	select SND_SOC_TEGRA210_XBAR_ALT
 	select SND_SOC_TEGRA210_PCM_ALT
 	select SND_SOC_TEGRA210_ADMA_ALT
diff --git a/sound/soc/tegra-alt/Makefile b/sound/soc/tegra-alt/Makefile
index eed665bf..17db6049 100644
--- a/sound/soc/tegra-alt/Makefile
+++ b/sound/soc/tegra-alt/Makefile
@@ -8,9 +8,11 @@ snd-soc-tegra-alt-utils-objs := tegra_asoc_utils_alt.o
 snd-soc-tegra30-alt-apbif-objs := tegra30_apbif_alt.o
 snd-soc-tegra30-alt-xbar-objs := tegra30_xbar_alt.o
 snd-soc-tegra30-alt-i2s-objs := tegra30_i2s_alt.o
+snd-soc-tegra30-alt-dam-objs := tegra30_dam_alt.o
 snd-soc-tegra30-alt-spdif-objs := tegra30_spdif_alt.o
 snd-soc-tegra114-alt-amx-objs := tegra114_amx_alt.o
 snd-soc-tegra114-alt-adx-objs := tegra114_adx_alt.o
+snd-soc-tegra124-alt-afc-objs := tegra124_afc_alt.o
 snd-soc-tegra210-alt-admaif-objs := tegra210_admaif_alt.o
 snd-soc-tegra210-alt-xbar-objs := tegra210_xbar_alt.o
 snd-soc-tegra210-alt-i2s-objs := tegra210_i2s_alt.o
@@ -29,9 +31,11 @@ obj-$(CONFIG_SND_SOC_TEGRA_ALT) += snd-soc-tegra210-alt-fpga-clock.o
 obj-$(CONFIG_SND_SOC_TEGRA30_APBIF_ALT) += snd-soc-tegra30-alt-apbif.o
 obj-$(CONFIG_SND_SOC_TEGRA30_XBAR_ALT) += snd-soc-tegra30-alt-xbar.o
 obj-$(CONFIG_SND_SOC_TEGRA30_I2S_ALT) += snd-soc-tegra30-alt-i2s.o
+obj-$(CONFIG_SND_SOC_TEGRA30_DAM_ALT) += snd-soc-tegra30-alt-dam.o
 obj-$(CONFIG_SND_SOC_TEGRA30_SPDIF_ALT) += snd-soc-tegra30-alt-spdif.o
 obj-$(CONFIG_SND_SOC_TEGRA114_AMX_ALT) += snd-soc-tegra114-alt-amx.o
 obj-$(CONFIG_SND_SOC_TEGRA114_ADX_ALT) += snd-soc-tegra114-alt-adx.o
+obj-$(CONFIG_SND_SOC_TEGRA124_AFC_ALT) += snd-soc-tegra124-alt-afc.o
 obj-$(CONFIG_SND_SOC_TEGRA210_ADMAIF_ALT) += snd-soc-tegra210-alt-admaif.o
 obj-$(CONFIG_SND_SOC_TEGRA210_XBAR_ALT) += snd-soc-tegra210-alt-xbar.o
 obj-$(CONFIG_SND_SOC_TEGRA210_I2S_ALT) += snd-soc-tegra210-alt-i2s.o