ASoC: tegra: Add 'oot' suffix in compatibles

The audio drivers are getting upstreamed continuously with incremental
feature support. However, the OOT version of driver will be used till
all features are available from upstream driver.

Add the "-oot" prefix in the driver's name so that OOT version of driver
can be selected from the device tree file.

Bug 3583581

Change-Id: Iacc55c05bf07d6cc4a0d9745903b0fa92e60d9b3
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2866070
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Mohan Kumar D <mkumard@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Sheetal . <sheetal@nvidia.com>
Tested-by: Mohan Kumar D <mkumard@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Sameer Pujar
2023-03-05 14:14:36 +00:00
committed by mobile promotions
parent a87c10d72c
commit 66a89e5506
9 changed files with 23 additions and 23 deletions

View File

@@ -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 <linux/clk.h>
#include <linux/delay.h>
@@ -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);

View File

@@ -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);

View File

@@ -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 <linux/clk.h>
#include <linux/device.h>
@@ -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);

View File

@@ -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 <linux/clk.h>
#include <linux/device.h>
@@ -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);

View File

@@ -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 <linux/clk.h>
#include <linux/device.h>
@@ -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);

View File

@@ -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 <linux/clk.h>
#include <linux/device.h>
@@ -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);

View File

@@ -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 <linux/clk.h>
#include <linux/device.h>
@@ -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);

View File

@@ -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 <linux/clk.h>
#include <linux/device.h>
@@ -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);

View File

@@ -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 <linux/clk.h>
#include <linux/device.h>
@@ -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);