From 2e561466a6da110d7199bdf074791acbe3d3edf9 Mon Sep 17 00:00:00 2001 From: Sameer Pujar Date: Sun, 17 Dec 2017 23:51:33 +0530 Subject: [PATCH] tegra-alt: amx: fix sound card reg failure 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 Reviewed-on: https://git-master.nvidia.com/r/1619875 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Mohan Kumar D Reviewed-by: Ravindra Lokhande Reviewed-by: Alex Waterman Tested-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions --- sound/soc/tegra-alt/tegra210_amx_alt.c | 7 +++++++ sound/soc/tegra-alt/tegra210_xbar_alt.c | 12 ------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sound/soc/tegra-alt/tegra210_amx_alt.c b/sound/soc/tegra-alt/tegra210_amx_alt.c index 83c3b22b..88af7941 100644 --- a/sound/soc/tegra-alt/tegra210_amx_alt.c +++ b/sound/soc/tegra-alt/tegra210_amx_alt.c @@ -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); diff --git a/sound/soc/tegra-alt/tegra210_xbar_alt.c b/sound/soc/tegra-alt/tegra210_xbar_alt.c index ad9bf4b5..c7f68a9f 100644 --- a/sound/soc/tegra-alt/tegra210_xbar_alt.c +++ b/sound/soc/tegra-alt/tegra210_xbar_alt.c @@ -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,