diff --git a/sound/soc/tegra/tegra186_arad.c b/sound/soc/tegra/tegra186_arad.c index 5f455a55..762358d3 100644 --- a/sound/soc/tegra/tegra186_arad.c +++ b/sound/soc/tegra/tegra186_arad.c @@ -2,7 +2,7 @@ // // tegra186_arad.c - Tegra186 ARAD driver // -// Copyright (c) 2015-2021, NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2015-2023, NVIDIA CORPORATION. All rights reserved. #include #include @@ -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" }, + { .compatible = "nvidia,tegra186-arad-oot" }, {}, }; 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 8b0e2d57..a95fa29f 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")) + if (of_machine_is_compatible("nvidia,tegra186-asrc-oot")) 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")) + if (of_machine_is_compatible("nvidia,tegra186-asrc-oot")) 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", .data = &soc_data_tegra186 }, - { .compatible = "nvidia,tegra194-asrc", .data = &soc_data_tegra186 }, - { .compatible = "nvidia,tegra239-asrc", .data = &soc_data_tegra239 }, + { .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 }, {}, }; MODULE_DEVICE_TABLE(of, tegra186_asrc_of_match); diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c index a9b8ba55..87c868b9 100644 --- a/sound/soc/tegra/tegra210_adx.c +++ b/sound/soc/tegra/tegra210_adx.c @@ -2,7 +2,7 @@ // // tegra210_adx.c - Tegra210 ADX driver // -// Copyright (c) 2014-2021 NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2014-2023 NVIDIA CORPORATION. All rights reserved. #include #include @@ -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" }, + { .compatible = "nvidia,tegra210-adx-oot" }, {}, }; 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 2d8df49f..bf239dfe 100644 --- a/sound/soc/tegra/tegra210_afc.c +++ b/sound/soc/tegra/tegra210_afc.c @@ -2,7 +2,7 @@ // // tegra210_afc.c - Tegra210 AFC driver // -// Copyright (c) 2014-2021 NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2014-2023 NVIDIA CORPORATION. All rights reserved. #include #include @@ -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", .data = &soc_data_tegra210 }, - { .compatible = "nvidia,tegra186-afc", .data = &soc_data_tegra186 }, + { .compatible = "nvidia,tegra210-afc-oot", .data = &soc_data_tegra210 }, + { .compatible = "nvidia,tegra186-afc-oot", .data = &soc_data_tegra186 }, {}, }; MODULE_DEVICE_TABLE(of, tegra210_afc_of_match); diff --git a/sound/soc/tegra/tegra210_amx.c b/sound/soc/tegra/tegra210_amx.c index f6dfe443..b4b0c183 100644 --- a/sound/soc/tegra/tegra210_amx.c +++ b/sound/soc/tegra/tegra210_amx.c @@ -2,7 +2,7 @@ // // tegra210_amx.c - Tegra210 AMX driver // -// Copyright (c) 2014-2021 NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2014-2023 NVIDIA CORPORATION. All rights reserved. #include #include @@ -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", .data = &soc_data_tegra210 }, - { .compatible = "nvidia,tegra194-amx", .data = &soc_data_tegra194 }, + { .compatible = "nvidia,tegra210-amx-oot", .data = &soc_data_tegra210 }, + { .compatible = "nvidia,tegra194-amx-oot", .data = &soc_data_tegra194 }, {}, }; MODULE_DEVICE_TABLE(of, tegra210_amx_of_match); diff --git a/sound/soc/tegra/tegra210_mixer.c b/sound/soc/tegra/tegra210_mixer.c index 99bada59..b6d954ee 100644 --- a/sound/soc/tegra/tegra210_mixer.c +++ b/sound/soc/tegra/tegra210_mixer.c @@ -2,7 +2,7 @@ // // tegra210_mixer.c - Tegra210 MIXER driver // -// Copyright (c) 2014-2021 NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2014-2023 NVIDIA CORPORATION. All rights reserved. #include #include @@ -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" }, + { .compatible = "nvidia,tegra210-amixer-oot" }, {}, }; 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 a9bf21ff..35265367 100644 --- a/sound/soc/tegra/tegra210_mvc.c +++ b/sound/soc/tegra/tegra210_mvc.c @@ -2,7 +2,7 @@ // // tegra210_mvc.c - Tegra210 MVC driver // -// Copyright (c) 2014-2021 NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2014-2023 NVIDIA CORPORATION. All rights reserved. #include #include @@ -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" }, + { .compatible = "nvidia,tegra210-mvc-oot" }, {}, }; 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 68ab67ef..83952d46 100644 --- a/sound/soc/tegra/tegra210_ope.c +++ b/sound/soc/tegra/tegra210_ope.c @@ -2,7 +2,7 @@ // // tegra210_ope.c - Tegra210 OPE driver // -// Copyright (c) 2014-2021, NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2014-2023, NVIDIA CORPORATION. All rights reserved. #include #include @@ -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" }, + { .compatible = "nvidia,tegra210-ope-oot" }, {}, }; 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 e2214277..85364af7 100644 --- a/sound/soc/tegra/tegra210_sfc.c +++ b/sound/soc/tegra/tegra210_sfc.c @@ -2,7 +2,7 @@ // // tegra210_sfc.c - Tegra210 SFC driver // -// Copyright (c) 2014-2021 NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2014-2023 NVIDIA CORPORATION. All rights reserved. #include #include @@ -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" }, + { .compatible = "nvidia,tegra210-sfc-oot" }, {}, }; MODULE_DEVICE_TABLE(of, tegra210_sfc_of_match);