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 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

tegra-alt: adsp: Use devm_clk_get for t210

Browse Source 
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 <dpaliwal@nvidia.com>
Reviewed-on: http://git-master/r/1471996
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Diwakar Paliwal
2017-04-28 13:02:17 +05:30
committed by Sameer Pujar
parent af364ab0a2
commit f2c8d09fea
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/tegra-alt/Kconfig
View File

@@ -241,6 +241,7 @@ config SND_SOC_TEGRA_T210REF_MOBILE_ALT
select SND_SOC_TEGRA210_MVC_ALT select SND_SOC_TEGRA210_MVC_ALT
select SND_SOC_TEGRA210_OPE_ALT select SND_SOC_TEGRA210_OPE_ALT
select SND_SOC_TEGRA210_SPDIF_ALT select SND_SOC_TEGRA210_SPDIF_ALT
select SND_SOC_TEGRA210_ADSP_ALT if TEGRA_NVADSP
select SND_SOC_SPDIF select SND_SOC_SPDIF
select SND_SOC_RT5640 select SND_SOC_RT5640
select SND_SOC_RT5659 select SND_SOC_RT5659

15
sound/soc/tegra-alt/tegra210_adsp_alt.c
View File

@@ -4403,20 +4403,6 @@ static int tegra210_adsp_audio_platform_probe(struct platform_device *pdev)
if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) { 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"); adsp->ahub_clk = devm_clk_get(&pdev->dev, "ahub");
if (IS_ERR(adsp->ahub_clk)) { if (IS_ERR(adsp->ahub_clk)) {
dev_err(&pdev->dev, "Error: Missing AHUB clock\n"); dev_err(&pdev->dev, "Error: Missing AHUB clock\n");
@@ -4431,6 +4417,7 @@ static int tegra210_adsp_audio_platform_probe(struct platform_device *pdev)
goto err; goto err;
} }
if (!IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)) {
adsp->apb2ape_clk = devm_clk_get(&pdev->dev, "apb2ape"); adsp->apb2ape_clk = devm_clk_get(&pdev->dev, "apb2ape");
if (IS_ERR(adsp->apb2ape_clk)) { if (IS_ERR(adsp->apb2ape_clk)) {
dev_err(&pdev->dev, "Error: Missing APB2APE clock\n"); dev_err(&pdev->dev, "Error: Missing APB2APE clock\n");