From 036869e456ce53a67d06de3f26d1c49013bacc86 Mon Sep 17 00:00:00 2001 From: Sameer Pujar Date: Sun, 6 Sep 2015 16:46:21 -0700 Subject: [PATCH] adma: tegra: prepare clk source before using Preparing clk source is required to have non-zero consumers on the clk. The API clk_prepare() has to be called before clk_enable(). Added similar changes during disable also Change-Id: I27beac0d120cfa1b63cbb669de0482c9c13aacb3 (cherry picked from commit 9fa80d2afda2f2942d6c5b0407c59ad9e3337493) Reviewed-on: http://git-master/r/795020 Signed-off-by: Asha T Reviewed-on: http://git-master/r/807790 Reviewed-by: Ravindra Lokhande --- sound/soc/tegra-alt/tegra210_xbar_alt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/tegra-alt/tegra210_xbar_alt.c b/sound/soc/tegra-alt/tegra210_xbar_alt.c index 0fa8cf5f..0a134d71 100644 --- a/sound/soc/tegra-alt/tegra210_xbar_alt.c +++ b/sound/soc/tegra-alt/tegra210_xbar_alt.c @@ -60,8 +60,8 @@ static int tegra210_xbar_runtime_suspend(struct device *dev) regcache_cache_only(xbar->regmap, true); if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) { - clk_disable(xbar->clk); - clk_disable(xbar->clk_ape); + clk_disable_unprepare(xbar->clk); + clk_disable_unprepare(xbar->clk_ape); } return 0; @@ -72,15 +72,15 @@ static int tegra210_xbar_runtime_resume(struct device *dev) int ret; if (!(tegra_platform_is_unit_fpga() || tegra_platform_is_fpga())) { - ret = clk_enable(xbar->clk_ape); + ret = clk_prepare_enable(xbar->clk_ape); if (ret) { - dev_err(dev, "clk_enable failed: %d\n", ret); + dev_err(dev, "clk_prepare_enable failed: %d\n", ret); return ret; } - ret = clk_enable(xbar->clk); + ret = clk_prepare_enable(xbar->clk); if (ret) { - dev_err(dev, "clk_enable failed: %d\n", ret); + dev_err(dev, "clk_prepare_enable failed: %d\n", ret); return ret; } }