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

ASoC: tegra-alt: update audio drivers for kernel-4.4

Browse Source 
Made changes needed for t21x to get audio working on kernel 4.4.

Bug 1810165

Change-Id: I85116662083f1430182248e2a7c51165901c0dce
Signed-off-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-on: http://git-master/r/1267443
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Ravindra Lokhande
2016-12-08 14:24:58 +05:30
committed by Sameer Pujar
parent 4ecda75d43
commit 26caa435c1
3 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,10 +247,10 @@ 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
select SND_SOC_SPDIF select SND_SOC_SPDIF
select SND_SOC_RT5639 select SND_SOC_RT5639
select SND_SOC_RT5659 select SND_SOC_RT5659
select SND_SOC_TEGRA_ASOC_MACHINE_ALT
help help
Say Y or M here. Say Y or M here.

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

@@ -87,6 +87,7 @@ obj-$(CONFIG_SND_SOC_TEGRA_P1889REF_ALT) += snd-soc-tegra-alt-machine.o
obj-$(CONFIG_SND_SOC_TEGRA_GRENADA_ALT) += snd-soc-tegra-alt-grenada.o obj-$(CONFIG_SND_SOC_TEGRA_GRENADA_ALT) += snd-soc-tegra-alt-grenada.o
obj-$(CONFIG_SND_SOC_TEGRA_GRENADA_ALT) += snd-soc-tegra-alt-machine.o obj-$(CONFIG_SND_SOC_TEGRA_GRENADA_ALT) += snd-soc-tegra-alt-machine.o
obj-$(CONFIG_SND_SOC_TEGRA_T210REF_MOBILE_ALT) += snd-soc-tegra-alt-t210ref-mobile.o obj-$(CONFIG_SND_SOC_TEGRA_T210REF_MOBILE_ALT) += snd-soc-tegra-alt-t210ref-mobile.o
obj-$(CONFIG_SND_SOC_TEGRA_T210REF_MOBILE_ALT) += snd-soc-tegra-alt-machine.o
obj-$(CONFIG_SND_SOC_TEGRA_T210REF_MOBILE_ES755_ALT) += snd-soc-tegra-alt-t210ref-mobile-es755.o obj-$(CONFIG_SND_SOC_TEGRA_T210REF_MOBILE_ES755_ALT) += snd-soc-tegra-alt-t210ref-mobile-es755.o
obj-$(CONFIG_SND_SOC_TEGRA_T210REF_MOBILE_ES755_ALT) += snd-soc-tegra-alt-machine.o obj-$(CONFIG_SND_SOC_TEGRA_T210REF_MOBILE_ES755_ALT) += snd-soc-tegra-alt-machine.o
obj-$(CONFIG_SND_SOC_TEGRA_T210REF_ALT) += snd-soc-tegra-alt-t210ref.o obj-$(CONFIG_SND_SOC_TEGRA_T210REF_ALT) += snd-soc-tegra-alt-t210ref.o

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

@@ -63,9 +63,7 @@ static int tegra210_xbar_runtime_suspend(struct device *dev)
if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) { if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) {
clk_disable_unprepare(xbar->clk); clk_disable_unprepare(xbar->clk);
clk_disable_unprepare(xbar->clk_ape); clk_disable_unprepare(xbar->clk_ape);
#if defined(CONFIG_ARCH_TEGRA_18x_SOC)
clk_disable_unprepare(xbar->clk_apb2ape); clk_disable_unprepare(xbar->clk_apb2ape);
#endif
} }
return 0; return 0;
@@ -82,13 +80,12 @@ static int tegra210_xbar_runtime_resume(struct device *dev)
return ret; return ret;
} }
#if defined(CONFIG_ARCH_TEGRA_18x_SOC)
ret = clk_prepare_enable(xbar->clk_apb2ape); ret = clk_prepare_enable(xbar->clk_apb2ape);
if (ret) { if (ret) {
dev_err(dev, "clk_prepare_enable failed: %d\n", ret); dev_err(dev, "clk_prepare_enable failed: %d\n", ret);
return ret; return ret;
} }
#endif
ret = clk_prepare_enable(xbar->clk); ret = clk_prepare_enable(xbar->clk);
if (ret) { if (ret) {
dev_err(dev, "clk_prepare_enable failed: %d\n", ret); dev_err(dev, "clk_prepare_enable failed: %d\n", ret);
@@ -917,25 +914,13 @@ static int tegra210_xbar_probe(struct platform_device *pdev)
goto err; goto err;
} }
#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
xbar->clk_parent = clk_get_sys(NULL, "pll_a_out0");
#else
xbar->clk_parent = devm_clk_get(&pdev->dev, "pll_a_out0"); xbar->clk_parent = devm_clk_get(&pdev->dev, "pll_a_out0");
#endif
if (IS_ERR(xbar->clk_parent)) { if (IS_ERR(xbar->clk_parent)) {
dev_err(&pdev->dev, "Can't retrieve pll_a_out0 clock\n"); dev_err(&pdev->dev, "Can't retrieve pll_a_out0 clock\n");
ret = PTR_ERR(xbar->clk_parent); ret = PTR_ERR(xbar->clk_parent);
goto err_clk_put; goto err_clk_put;
} }
#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
xbar->clk_ape = clk_get_sys(NULL, "xbar.ape");
if (IS_ERR(xbar->clk_ape)) {
dev_err(&pdev->dev, "Can't retrieve ape clock\n");
ret = PTR_ERR(xbar->clk_ape);
goto err_clk_put_parent;
}
#else
xbar->clk_apb2ape = devm_clk_get(&pdev->dev, "apb2ape"); xbar->clk_apb2ape = devm_clk_get(&pdev->dev, "apb2ape");
if (IS_ERR(xbar->clk_apb2ape)) { if (IS_ERR(xbar->clk_apb2ape)) {
dev_err(&pdev->dev, "Can't retrieve apb2ape clock\n"); dev_err(&pdev->dev, "Can't retrieve apb2ape clock\n");
@@ -949,7 +934,6 @@ static int tegra210_xbar_probe(struct platform_device *pdev)
ret = PTR_ERR(xbar->clk_ape); ret = PTR_ERR(xbar->clk_ape);
goto err_clk_put_apb2ape; goto err_clk_put_apb2ape;
} }
#endif
} }
parent_clk = clk_get_parent(xbar->clk); parent_clk = clk_get_parent(xbar->clk);
@@ -1017,13 +1001,6 @@ err_pm_disable:
tegra_pd_remove_device(&pdev->dev); tegra_pd_remove_device(&pdev->dev);
err_clk_set_parent: err_clk_set_parent:
clk_set_parent(xbar->clk, parent_clk); clk_set_parent(xbar->clk, parent_clk);
#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
err_clk_put_ape:
clk_put(xbar->clk_ape);
err_clk_put_parent:
if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga()))
clk_put(xbar->clk_parent);
#else
err_clk_put_ape: err_clk_put_ape:
devm_clk_put(&pdev->dev, xbar->clk_ape); devm_clk_put(&pdev->dev, xbar->clk_ape);
err_clk_put_apb2ape: err_clk_put_apb2ape:
@@ -1031,7 +1008,6 @@ err_clk_put_apb2ape:
err_clk_put_parent: err_clk_put_parent:
if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga()))
devm_clk_put(&pdev->dev, xbar->clk_parent); devm_clk_put(&pdev->dev, xbar->clk_parent);
#endif
err_clk_put: err_clk_put:
devm_clk_put(&pdev->dev, xbar->clk); devm_clk_put(&pdev->dev, xbar->clk);
err: err:
@@ -1049,14 +1025,9 @@ static int tegra210_xbar_remove(struct platform_device *pdev)
tegra_pd_remove_device(&pdev->dev); tegra_pd_remove_device(&pdev->dev);
devm_clk_put(&pdev->dev, xbar->clk); devm_clk_put(&pdev->dev, xbar->clk);
#if defined(CONFIG_ARCH_TEGRA_21x_SOC)
clk_put(xbar->clk_parent);
clk_put(xbar->clk_ape);
#else
devm_clk_put(&pdev->dev, xbar->clk_parent); devm_clk_put(&pdev->dev, xbar->clk_parent);
devm_clk_put(&pdev->dev, xbar->clk_ape); devm_clk_put(&pdev->dev, xbar->clk_ape);
devm_clk_put(&pdev->dev, xbar->clk_apb2ape); devm_clk_put(&pdev->dev, xbar->clk_apb2ape);
#endif
return 0; return 0;
} }