diff --git a/sound/soc/tegra/tegra186_arad.c b/sound/soc/tegra/tegra186_arad.c
index 762358d3..29680d18 100644
--- a/sound/soc/tegra/tegra186_arad.c
+++ b/sound/soc/tegra/tegra186_arad.c
@@ -655,7 +655,7 @@ static const struct regmap_config tegra186_arad_regmap_config = {
 };
 
 static const struct of_device_id tegra186_arad_of_match[] = {
-	{ .compatible = "nvidia,tegra186-arad-oot" },
+	{ .compatible = "nvidia,tegra186-arad" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra186_arad_of_match);
diff --git a/sound/soc/tegra/tegra186_asrc.c b/sound/soc/tegra/tegra186_asrc.c
index a95fa29f..8b0e2d57 100644
--- a/sound/soc/tegra/tegra186_asrc.c
+++ b/sound/soc/tegra/tegra186_asrc.c
@@ -188,7 +188,7 @@ static int tegra186_asrc_runtime_resume(struct device *dev)
 	 * Hw Bug:200208400 - asrc interrupt status gets cleared when
 	 * it is cleared twice. This WAR is only applicable for T186
 	 */
-	if (of_machine_is_compatible("nvidia,tegra186-asrc-oot"))
+	if (of_machine_is_compatible("nvidia,tegra186-asrc"))
 		regmap_write(asrc->regmap, TEGRA186_ASRC_GLOBAL_INT_CLEAR, 0x1);
 
 	for (lane_id = 0; lane_id < 6; lane_id++) {
@@ -1056,7 +1056,7 @@ static void tegra186_asrc_ahc_cb(void *data)
 	 * Hw Bug:200208400 - asrc interrupt status gets cleared when
 	 * it is cleared twice. This WAR is only applicable for T186
 	 */
-	if (of_machine_is_compatible("nvidia,tegra186-asrc-oot"))
+	if (of_machine_is_compatible("nvidia,tegra186-asrc"))
 		regmap_write(asrc->regmap, TEGRA186_ASRC_GLOBAL_INT_CLEAR, 0x1);
 
 	regmap_write(asrc->regmap, TEGRA186_ASRC_GLOBAL_ENB, 0x0);
@@ -1075,9 +1075,9 @@ static const struct tegra_asrc_soc_data soc_data_tegra239 = {
 };
 
 static const struct of_device_id tegra186_asrc_of_match[] = {
-	{ .compatible = "nvidia,tegra186-asrc-oot", .data = &soc_data_tegra186 },
-	{ .compatible = "nvidia,tegra194-asrc-oot", .data = &soc_data_tegra186 },
-	{ .compatible = "nvidia,tegra239-asrc-oot", .data = &soc_data_tegra239 },
+	{ .compatible = "nvidia,tegra186-asrc", .data = &soc_data_tegra186 },
+	{ .compatible = "nvidia,tegra194-asrc", .data = &soc_data_tegra186 },
+	{ .compatible = "nvidia,tegra239-asrc", .data = &soc_data_tegra239 },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra186_asrc_of_match);
diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c
index 230dce47..05288d53 100644
--- a/sound/soc/tegra/tegra186_dspk.c
+++ b/sound/soc/tegra/tegra186_dspk.c
@@ -2,7 +2,7 @@
 //
 // tegra186_dspk.c - Tegra186 DSPK driver
 //
-// Copyright (c) 2020-2022 NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2020-2023 NVIDIA CORPORATION. All rights reserved.
 
 #include <linux/clk.h>
 #include <linux/device.h>
@@ -624,7 +624,7 @@ static const struct regmap_config tegra186_dspk_regmap = {
 };
 
 static const struct of_device_id tegra186_dspk_of_match[] = {
-	{ .compatible = "nvidia,tegra186-dspk-oot" },
+	{ .compatible = "nvidia,tegra186-dspk" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra186_dspk_of_match);
diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c
index dc943c37..44bdaf01 100644
--- a/sound/soc/tegra/tegra210_admaif.c
+++ b/sound/soc/tegra/tegra210_admaif.c
@@ -1218,8 +1218,8 @@ static const struct tegra_admaif_soc_data soc_data_tegra186 = {
 };
 
 static const struct of_device_id tegra_admaif_of_match[] = {
-	{ .compatible = "nvidia,tegra210-admaif-oot", .data = &soc_data_tegra210 },
-	{ .compatible = "nvidia,tegra186-admaif-oot", .data = &soc_data_tegra186 },
+	{ .compatible = "nvidia,tegra210-admaif", .data = &soc_data_tegra210 },
+	{ .compatible = "nvidia,tegra186-admaif", .data = &soc_data_tegra186 },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra_admaif_of_match);
diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c
index 87c868b9..98353d91 100644
--- a/sound/soc/tegra/tegra210_adx.c
+++ b/sound/soc/tegra/tegra210_adx.c
@@ -701,7 +701,7 @@ static const struct regmap_config tegra210_adx_regmap_config = {
 };
 
 static const struct of_device_id tegra210_adx_of_match[] = {
-	{ .compatible = "nvidia,tegra210-adx-oot" },
+	{ .compatible = "nvidia,tegra210-adx" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra210_adx_of_match);
diff --git a/sound/soc/tegra/tegra210_afc.c b/sound/soc/tegra/tegra210_afc.c
index bf239dfe..3beb557e 100644
--- a/sound/soc/tegra/tegra210_afc.c
+++ b/sound/soc/tegra/tegra210_afc.c
@@ -489,8 +489,8 @@ static const struct tegra210_afc_soc_data soc_data_tegra186 = {
 };
 
 static const struct of_device_id tegra210_afc_of_match[] = {
-	{ .compatible = "nvidia,tegra210-afc-oot", .data = &soc_data_tegra210 },
-	{ .compatible = "nvidia,tegra186-afc-oot", .data = &soc_data_tegra186 },
+	{ .compatible = "nvidia,tegra210-afc", .data = &soc_data_tegra210 },
+	{ .compatible = "nvidia,tegra186-afc", .data = &soc_data_tegra186 },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra210_afc_of_match);
diff --git a/sound/soc/tegra/tegra210_ahub.c b/sound/soc/tegra/tegra210_ahub.c
index 741ee160..fa2fa946 100644
--- a/sound/soc/tegra/tegra210_ahub.c
+++ b/sound/soc/tegra/tegra210_ahub.c
@@ -1574,9 +1574,9 @@ static const struct tegra_ahub_soc_data soc_data_tegra234 = {
 };
 
 static const struct of_device_id tegra_ahub_of_match[] = {
-	{ .compatible = "nvidia,tegra210-ahub-oot", .data = &soc_data_tegra210 },
-	{ .compatible = "nvidia,tegra186-ahub-oot", .data = &soc_data_tegra186 },
-	{ .compatible = "nvidia,tegra234-ahub-oot", .data = &soc_data_tegra234 },
+	{ .compatible = "nvidia,tegra210-ahub", .data = &soc_data_tegra210 },
+	{ .compatible = "nvidia,tegra186-ahub", .data = &soc_data_tegra186 },
+	{ .compatible = "nvidia,tegra234-ahub", .data = &soc_data_tegra234 },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra_ahub_of_match);
diff --git a/sound/soc/tegra/tegra210_amx.c b/sound/soc/tegra/tegra210_amx.c
index b4b0c183..d4025c7a 100644
--- a/sound/soc/tegra/tegra210_amx.c
+++ b/sound/soc/tegra/tegra210_amx.c
@@ -784,8 +784,8 @@ static const struct tegra210_amx_soc_data soc_data_tegra194 = {
 };
 
 static const struct of_device_id tegra210_amx_of_match[] = {
-	{ .compatible = "nvidia,tegra210-amx-oot", .data = &soc_data_tegra210 },
-	{ .compatible = "nvidia,tegra194-amx-oot", .data = &soc_data_tegra194 },
+	{ .compatible = "nvidia,tegra210-amx", .data = &soc_data_tegra210 },
+	{ .compatible = "nvidia,tegra194-amx", .data = &soc_data_tegra194 },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra210_amx_of_match);
diff --git a/sound/soc/tegra/tegra210_dmic.c b/sound/soc/tegra/tegra210_dmic.c
index cbb4d856..d8c40a8d 100644
--- a/sound/soc/tegra/tegra210_dmic.c
+++ b/sound/soc/tegra/tegra210_dmic.c
@@ -2,7 +2,7 @@
 //
 // tegra210_dmic.c - Tegra210 DMIC driver
 //
-// Copyright (c) 2020-2022 NVIDIA CORPORATION.  All rights reserved.
+// Copyright (c) 2020-2023 NVIDIA CORPORATION.  All rights reserved.
 
 #include <linux/clk.h>
 #include <linux/device.h>
@@ -695,7 +695,7 @@ static const struct dev_pm_ops tegra210_dmic_pm_ops = {
 };
 
 static const struct of_device_id tegra210_dmic_of_match[] = {
-	{ .compatible = "nvidia,tegra210-dmic-oot" },
+	{ .compatible = "nvidia,tegra210-dmic" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra210_dmic_of_match);
diff --git a/sound/soc/tegra/tegra210_i2s.c b/sound/soc/tegra/tegra210_i2s.c
index 9a256297..092ae5ca 100644
--- a/sound/soc/tegra/tegra210_i2s.c
+++ b/sound/soc/tegra/tegra210_i2s.c
@@ -1273,7 +1273,7 @@ static const struct dev_pm_ops tegra210_i2s_pm_ops = {
 };
 
 static const struct of_device_id tegra210_i2s_of_match[] = {
-	{ .compatible = "nvidia,tegra210-i2s-oot" },
+	{ .compatible = "nvidia,tegra210-i2s" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra210_i2s_of_match);
diff --git a/sound/soc/tegra/tegra210_mixer.c b/sound/soc/tegra/tegra210_mixer.c
index b6d954ee..6fd3ce4f 100644
--- a/sound/soc/tegra/tegra210_mixer.c
+++ b/sound/soc/tegra/tegra210_mixer.c
@@ -623,7 +623,7 @@ static const struct regmap_config tegra210_mixer_regmap_config = {
 };
 
 static const struct of_device_id tegra210_mixer_of_match[] = {
-	{ .compatible = "nvidia,tegra210-amixer-oot" },
+	{ .compatible = "nvidia,tegra210-amixer" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra210_mixer_of_match);
diff --git a/sound/soc/tegra/tegra210_mvc.c b/sound/soc/tegra/tegra210_mvc.c
index 35265367..3c8db4ff 100644
--- a/sound/soc/tegra/tegra210_mvc.c
+++ b/sound/soc/tegra/tegra210_mvc.c
@@ -688,7 +688,7 @@ static const struct regmap_config tegra210_mvc_regmap_config = {
 };
 
 static const struct of_device_id tegra210_mvc_of_match[] = {
-	{ .compatible = "nvidia,tegra210-mvc-oot" },
+	{ .compatible = "nvidia,tegra210-mvc" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra210_mvc_of_match);
diff --git a/sound/soc/tegra/tegra210_ope.c b/sound/soc/tegra/tegra210_ope.c
index 83952d46..e674bb31 100644
--- a/sound/soc/tegra/tegra210_ope.c
+++ b/sound/soc/tegra/tegra210_ope.c
@@ -300,7 +300,7 @@ static const struct regmap_config tegra210_ope_regmap_config = {
 };
 
 static const struct of_device_id tegra210_ope_of_match[] = {
-	{ .compatible = "nvidia,tegra210-ope-oot" },
+	{ .compatible = "nvidia,tegra210-ope" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra210_ope_of_match);
diff --git a/sound/soc/tegra/tegra210_sfc.c b/sound/soc/tegra/tegra210_sfc.c
index 85364af7..c9b73028 100644
--- a/sound/soc/tegra/tegra210_sfc.c
+++ b/sound/soc/tegra/tegra210_sfc.c
@@ -3445,7 +3445,7 @@ static const struct regmap_config tegra210_sfc_regmap_config = {
 };
 
 static const struct of_device_id tegra210_sfc_of_match[] = {
-	{ .compatible = "nvidia,tegra210-sfc-oot" },
+	{ .compatible = "nvidia,tegra210-sfc" },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra210_sfc_of_match);