From f2c8d09fead6d64128f1e89362cdcd6bbde14698 Mon Sep 17 00:00:00 2001 From: Diwakar Paliwal Date: Fri, 28 Apr 2017 13:02:17 +0530 Subject: [PATCH] tegra-alt: adsp: Use devm_clk_get for t210 Use devm_clk_get for t210 during probe. This is required for successful probe as t210 and t186 use common clock framework on K4.4. Enable ADSP driver for t210 config. Bug 200297206 Change-Id: I56a7f6196c07edb00548217fac1f69b03de3a882 Signed-off-by: Diwakar Paliwal Reviewed-on: http://git-master/r/1471996 Reviewed-by: mobile promotions Tested-by: mobile promotions --- sound/soc/tegra-alt/Kconfig | 1 + sound/soc/tegra-alt/tegra210_adsp_alt.c | 39 +++++++++---------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/sound/soc/tegra-alt/Kconfig b/sound/soc/tegra-alt/Kconfig index 2c9f5ea5..11a6b9f7 100644 --- a/sound/soc/tegra-alt/Kconfig +++ b/sound/soc/tegra-alt/Kconfig @@ -241,6 +241,7 @@ config SND_SOC_TEGRA_T210REF_MOBILE_ALT select SND_SOC_TEGRA210_MVC_ALT select SND_SOC_TEGRA210_OPE_ALT select SND_SOC_TEGRA210_SPDIF_ALT + select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP select SND_SOC_SPDIF select SND_SOC_RT5640 select SND_SOC_RT5659 diff --git a/sound/soc/tegra-alt/tegra210_adsp_alt.c b/sound/soc/tegra-alt/tegra210_adsp_alt.c index 34d17b8a..8145eb3f 100644 --- a/sound/soc/tegra-alt/tegra210_adsp_alt.c +++ b/sound/soc/tegra-alt/tegra210_adsp_alt.c @@ -4403,34 +4403,21 @@ static int tegra210_adsp_audio_platform_probe(struct platform_device *pdev) if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) { - if (IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)) { - adsp->ahub_clk = clk_get_sys("tegra210-adsp", "ahub"); - if (IS_ERR(adsp->ahub_clk)) { - dev_err(&pdev->dev, "Error: Missing AHUB clock\n"); - ret = PTR_ERR(adsp->ahub_clk); - goto err; - } - adsp->ape_clk = clk_get_sys(NULL, "adsp.ape"); - if (IS_ERR(adsp->ape_clk)) { - dev_err(&pdev->dev, "Error: Missing APE clock\n"); - ret = PTR_ERR(adsp->ape_clk); - goto err; - } - } else { - adsp->ahub_clk = devm_clk_get(&pdev->dev, "ahub"); - if (IS_ERR(adsp->ahub_clk)) { - dev_err(&pdev->dev, "Error: Missing AHUB clock\n"); - ret = PTR_ERR(adsp->ahub_clk); - goto err; - } + adsp->ahub_clk = devm_clk_get(&pdev->dev, "ahub"); + if (IS_ERR(adsp->ahub_clk)) { + dev_err(&pdev->dev, "Error: Missing AHUB clock\n"); + ret = PTR_ERR(adsp->ahub_clk); + goto err; + } - adsp->ape_clk = devm_clk_get(&pdev->dev, "ape"); - if (IS_ERR(adsp->ape_clk)) { - dev_err(&pdev->dev, "Error: Missing APE clock\n"); - ret = PTR_ERR(adsp->ape_clk); - goto err; - } + adsp->ape_clk = devm_clk_get(&pdev->dev, "ape"); + if (IS_ERR(adsp->ape_clk)) { + dev_err(&pdev->dev, "Error: Missing APE clock\n"); + ret = PTR_ERR(adsp->ape_clk); + goto err; + } + if (!IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)) { adsp->apb2ape_clk = devm_clk_get(&pdev->dev, "apb2ape"); if (IS_ERR(adsp->apb2ape_clk)) { dev_err(&pdev->dev, "Error: Missing APB2APE clock\n");