From 11a70ecd4663d430be118923ca92426fcbbcb3ed Mon Sep 17 00:00:00 2001 From: Sameer Pujar Date: Fri, 9 Sep 2022 21:29:54 +0530 Subject: [PATCH] ASoC: tegra: Update compatible names Following drivers are upstreamed (and present in v5.15) but not yet feature complete: tegra186_dspk.c tegra210_admaif.c tegra210_ahub.c tegra210_dmic.c tegra210_i2s.c To use these drivers, device nodes in DT can use OOT specific compatibles. Update compatibles in drivers to facilitate this. Bug 3583581 Change-Id: I1a9e31fc5f1b2d2539f644a413ba0c06c6da2110 Signed-off-by: Sameer Pujar Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2774435 Reviewed-by: Mohan Kumar D Reviewed-by: Sharad Gupta GVS: Gerrit_Virtual_Submit --- sound/soc/tegra/tegra186_dspk.c | 2 +- sound/soc/tegra/tegra210_admaif.c | 4 ++-- sound/soc/tegra/tegra210_ahub.c | 6 +++--- sound/soc/tegra/tegra210_dmic.c | 2 +- sound/soc/tegra/tegra210_i2s.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/tegra/tegra186_dspk.c b/sound/soc/tegra/tegra186_dspk.c index ee1ed455..17f66c0f 100644 --- a/sound/soc/tegra/tegra186_dspk.c +++ b/sound/soc/tegra/tegra186_dspk.c @@ -656,7 +656,7 @@ static const struct regmap_config tegra186_dspk_regmap = { }; static const struct of_device_id tegra186_dspk_of_match[] = { - { .compatible = "nvidia,tegra186-dspk" }, + { .compatible = "nvidia,tegra186-dspk-oot" }, {}, }; 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 71aed394..6646b2d1 100644 --- a/sound/soc/tegra/tegra210_admaif.c +++ b/sound/soc/tegra/tegra210_admaif.c @@ -1211,8 +1211,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", .data = &soc_data_tegra210 }, - { .compatible = "nvidia,tegra186-admaif", .data = &soc_data_tegra186 }, + { .compatible = "nvidia,tegra210-admaif-oot", .data = &soc_data_tegra210 }, + { .compatible = "nvidia,tegra186-admaif-oot", .data = &soc_data_tegra186 }, {}, }; MODULE_DEVICE_TABLE(of, tegra_admaif_of_match); diff --git a/sound/soc/tegra/tegra210_ahub.c b/sound/soc/tegra/tegra210_ahub.c index 72e56b08..a21a9f9e 100644 --- a/sound/soc/tegra/tegra210_ahub.c +++ b/sound/soc/tegra/tegra210_ahub.c @@ -1483,9 +1483,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", .data = &soc_data_tegra210 }, - { .compatible = "nvidia,tegra186-ahub", .data = &soc_data_tegra186 }, - { .compatible = "nvidia,tegra234-ahub", .data = &soc_data_tegra234 }, + { .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 }, {}, }; MODULE_DEVICE_TABLE(of, tegra_ahub_of_match); diff --git a/sound/soc/tegra/tegra210_dmic.c b/sound/soc/tegra/tegra210_dmic.c index 7e7581c6..174591f6 100644 --- a/sound/soc/tegra/tegra210_dmic.c +++ b/sound/soc/tegra/tegra210_dmic.c @@ -692,7 +692,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" }, + { .compatible = "nvidia,tegra210-dmic-oot" }, {}, }; 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 6c113580..12157d42 100644 --- a/sound/soc/tegra/tegra210_i2s.c +++ b/sound/soc/tegra/tegra210_i2s.c @@ -1270,7 +1270,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" }, + { .compatible = "nvidia,tegra210-i2s-oot" }, {}, }; MODULE_DEVICE_TABLE(of, tegra210_i2s_of_match);