nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

tegra-alt: amx: fix sound card reg failure

Browse Source 
For t19x nvidia,tegra194-amx compatibility is used and the device name
is not properly populated and this results in sound card registration
failures. This change uses DRV_NAME and id, to populate the name. Same
approach can be extended later to other drivers as well.

Bug 200373426

Change-Id: I5c98c61be1044a6253b2b8e06b3f902ddbb4fe3a
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1619875
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Mohan Kumar D <mkumard@nvidia.com>
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Tested-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Sameer Pujar
2017-12-17 23:51:33 +05:30
parent 4c26e42c42
commit 2e561466a6
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/tegra-alt/tegra210_amx_alt.c
View File

@@ -948,6 +948,13 @@ static int tegra210_amx_platform_probe(struct platform_device *pdev)
goto err;
}
/* following is necessary to have the required codec-dai-name */
if (dev_set_name(&pdev->dev, "%s.%d", DRV_NAME, pdev->dev.id)) {
dev_err(&pdev->dev, "error in setting AMX dev name\n");
ret = -ENODEV;
goto err;
}
pm_runtime_enable(&pdev->dev);
if (!pm_runtime_enabled(&pdev->dev)) {
ret = tegra210_amx_runtime_resume(&pdev->dev);

12
sound/soc/tegra-alt/tegra210_xbar_alt.c
View File

@@ -1125,10 +1125,6 @@ static struct of_dev_auxdata tegra210_xbar_auxdata[] = {
"tegra210-i2s.3", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-i2s", T210_I2S5_BASE_ADDR,
"tegra210-i2s.4", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-amx", T210_AMX1_BASE_ADDR,
"tegra210-amx.0", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-amx", T210_AMX2_BASE_ADDR,
"tegra210-amx.1", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-adx", T210_ADX1_BASE_ADDR,
"tegra210-adx.0", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-adx", T210_ADX2_BASE_ADDR,
@@ -1191,14 +1187,6 @@ static struct of_dev_auxdata tegra186_xbar_auxdata[] = {
"tegra186-i2s.4", NULL),
OF_DEV_AUXDATA("nvidia,tegra186-i2s", T186_I2S6_BASE_ADDR,
"tegra186-i2s.5", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-amx", T186_AMX1_BASE_ADDR,
"tegra210-amx.0", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-amx", T186_AMX2_BASE_ADDR,
"tegra210-amx.1", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-amx", T186_AMX3_BASE_ADDR,
"tegra210-amx.2", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-amx", T186_AMX4_BASE_ADDR,
"tegra210-amx.3", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-adx", T186_ADX1_BASE_ADDR,
"tegra210-adx.0", NULL),
OF_DEV_AUXDATA("nvidia,tegra210-adx", T186_ADX2_BASE_ADDR,