diff --git a/sound/soc/tegra-alt/Kconfig b/sound/soc/tegra-alt/Kconfig
index c8c9247a..328a9b56 100644
--- a/sound/soc/tegra-alt/Kconfig
+++ b/sound/soc/tegra-alt/Kconfig
@@ -232,7 +232,7 @@ config SND_SOC_TEGRA_GRENADA_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_21x_SOC
+	depends on ARCH_TEGRA_210_SOC
 	select SND_SOC_TEGRA210_XBAR_ALT
 	select SND_SOC_TEGRA210_PCM_ALT
 	select SND_SOC_TEGRA210_ADMA_ALT
@@ -257,7 +257,7 @@ config SND_SOC_TEGRA_T210REF_MOBILE_ALT
 config SND_SOC_TEGRA_T210REF_MOBILE_ES755_ALT
 	tristate "SoC Audio support for T210Ref mobile"
 	depends on SND_SOC_TEGRA_ALT && I2C
-	depends on ARCH_TEGRA_21x_SOC
+	depends on ARCH_TEGRA_210_SOC
 	select SND_SOC_TEGRA210_XBAR_ALT
 	select SND_SOC_TEGRA210_PCM_ALT
 	select SND_SOC_TEGRA210_ADMA_ALT
@@ -283,7 +283,7 @@ config SND_SOC_TEGRA_T210REF_MOBILE_ES755_ALT
 config SND_SOC_TEGRA_T210REF_ALT
 	tristate "SoC Audio support for T210Ref"
 	depends on SND_SOC_TEGRA_ALT
-	depends on ARCH_TEGRA_21x_SOC
+	depends on ARCH_TEGRA_210_SOC
 	select SND_SOC_TEGRA210_XBAR_ALT
 	select SND_SOC_TEGRA210_PCM_ALT
 	select SND_SOC_TEGRA210_ADMA_ALT
@@ -327,7 +327,7 @@ config SND_SOC_TEGRA_P1889REF_ALT
 config SND_SOC_TEGRA_T210REF_P2382_ALT
 	tristate "SoC Audio support for P2382Ref T210"
 	depends on SND_SOC_TEGRA_ALT
-	depends on ARCH_TEGRA_21x_SOC
+	depends on ARCH_TEGRA_210_SOC
 	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/tegra210_adsp_alt.c b/sound/soc/tegra-alt/tegra210_adsp_alt.c
index 5928bb81..14dd04ff 100644
--- a/sound/soc/tegra-alt/tegra210_adsp_alt.c
+++ b/sound/soc/tegra-alt/tegra210_adsp_alt.c
@@ -3809,7 +3809,7 @@ static int tegra210_adsp_audio_platform_probe(struct platform_device *pdev)
 
 
 	if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) {
-		if (IS_ENABLED(CONFIG_ARCH_TEGRA_21x_SOC)) {
+		if (IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)) {
 			adsp->ahub_clk = clk_get_sys("tegra210-adsp", "ahub");
 			if (IS_ERR(adsp->ahub_clk)) {
 				dev_err(&pdev->dev, "Error: Missing AHUB clock\n");
diff --git a/sound/soc/tegra-alt/tegra210_afc_alt.c b/sound/soc/tegra-alt/tegra210_afc_alt.c
index 21f8ee8c..f9bac513 100644
--- a/sound/soc/tegra-alt/tegra210_afc_alt.c
+++ b/sound/soc/tegra-alt/tegra210_afc_alt.c
@@ -119,7 +119,7 @@ unsigned int tegra210_afc_get_sfc_id(unsigned int afc_id)
 }
 EXPORT_SYMBOL_GPL(tegra210_afc_get_sfc_id);
 
-#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_210_SOC)
 /* returns the destination I2S id connected along the AFC path */
 static unsigned int tegra210_afc_get_i2s_id(unsigned int afc_id)
 {
diff --git a/sound/soc/tegra-alt/tegra210_dmic_alt.c b/sound/soc/tegra-alt/tegra210_dmic_alt.c
index e45bbf9a..f733d126 100644
--- a/sound/soc/tegra-alt/tegra210_dmic_alt.c
+++ b/sound/soc/tegra-alt/tegra210_dmic_alt.c
@@ -520,7 +520,7 @@ static int tegra210_dmic_platform_probe(struct platform_device *pdev)
 			ret = PTR_ERR(dmic->clk_dmic);
 			goto err;
 		}
-#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_210_SOC)
 		dmic->clk_pll_a_out0 = clk_get_sys(NULL, "pll_a_out0");
 #else
 		dmic->clk_pll_a_out0 = devm_clk_get(&pdev->dev, "pll_a_out0");
diff --git a/sound/soc/tegra-alt/tegra210_i2s_alt.c b/sound/soc/tegra-alt/tegra210_i2s_alt.c
index 7a24c97e..3b6ac0cd 100644
--- a/sound/soc/tegra-alt/tegra210_i2s_alt.c
+++ b/sound/soc/tegra-alt/tegra210_i2s_alt.c
@@ -93,7 +93,7 @@ static int tegra210_i2s_set_clock_rate(struct device *dev, int clock_rate)
 				dev_err(dev, "Can't set I2S sync clock rate\n");
 				return ret;
 			}
-#if !defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if !defined(CONFIG_ARCH_TEGRA_210_SOC)
 			ret = clk_set_parent(i2s->clk_audio_sync,
 					i2s->clk_i2s_sync);
 			if (ret) {
@@ -1032,7 +1032,7 @@ static int tegra210_i2s_platform_probe(struct platform_device *pdev)
 			goto err_i2s_sync_clk_put;
 		}
 
-#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_210_SOC)
 		i2s->clk_i2s_source = clk_get_sys(NULL, "pll_a_out0");
 #else
 		i2s->clk_i2s_source = devm_clk_get(&pdev->dev, "pll_a_out0");
@@ -1187,7 +1187,7 @@ err_pm_disable:
 	pm_runtime_disable(&pdev->dev);
 err_pll_a_out0_clk_put:
 	if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga()))
-#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_210_SOC)
 		clk_put(i2s->clk_i2s_source);
 #else
 		devm_clk_put(&pdev->dev, i2s->clk_i2s_source);
diff --git a/sound/soc/tegra-alt/tegra210_xbar_alt.c b/sound/soc/tegra-alt/tegra210_xbar_alt.c
index 5dfaf6f6..31457bec 100644
--- a/sound/soc/tegra-alt/tegra210_xbar_alt.c
+++ b/sound/soc/tegra-alt/tegra210_xbar_alt.c
@@ -32,7 +32,7 @@
 
 #include "tegra210_xbar_alt.h"
 /* TODO: remove DRV_NAME_T18X after registering properly */
-#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_210_SOC)
 #define DRV_NAME "tegra210-axbar"
 #else
 #include <sound/tegra_audio.h>
@@ -131,7 +131,7 @@ int tegra210_xbar_codec_probe(struct snd_soc_codec *codec)
 }
 EXPORT_SYMBOL_GPL(tegra210_xbar_codec_probe);
 
-#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_210_SOC)
 #define DAI(sname)						\
 	{							\
 		.name = #sname,					\
@@ -752,7 +752,7 @@ static const struct snd_soc_dapm_route tegra210_xbar_routes[] = {
 	IN_OUT_ROUTES("ADX2-4")
 };
 
-#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_210_SOC)
 static struct snd_soc_codec_driver tegra210_xbar_codec = {
 	.probe = tegra210_xbar_codec_probe,
 	.dapm_widgets = tegra210_xbar_widgets,
@@ -777,7 +777,7 @@ static const struct of_device_id tegra210_xbar_of_match[] = {
 	{},
 };
 
-#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_210_SOC)
 static struct of_dev_auxdata tegra210_xbar_auxdata[] = {
 	OF_DEV_AUXDATA("nvidia,tegra210-admaif", ADMAIF_BASE_ADDR, "tegra210-admaif", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra210-i2s", I2S1_BASE_ADDR, "tegra210-i2s.0", NULL),
@@ -830,7 +830,7 @@ int tegra210_xbar_set_clock(unsigned long rate)
 }
 EXPORT_SYMBOL_GPL(tegra210_xbar_set_clock);
 
-#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_210_SOC)
 static int tegra210_xbar_registration(struct platform_device *pdev)
 {
 	int ret;
@@ -959,7 +959,7 @@ static int tegra210_xbar_probe(struct platform_device *pdev)
 			goto err_pm_disable;
 	}
 
-#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
+#if defined(CONFIG_ARCH_TEGRA_210_SOC)
 	ret = tegra210_xbar_registration(pdev);
 #else
 	ret = tegra186_xbar_registration(pdev);