diff options
| author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2012-06-05 06:29:42 +0200 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-06-12 18:32:56 +0200 |
| commit | 65d2bdd343bd07c8de7df7352186bfe57994b5e7 (patch) | |
| tree | 6c29eda6f1d3a76cae537b8579e25314121ed081 /sound/soc/tegra/tegra30_i2s.c | |
| parent | staging: nvec: add clk_prepare/clk_unprepare (diff) | |
| download | linux-65d2bdd343bd07c8de7df7352186bfe57994b5e7.tar.xz linux-65d2bdd343bd07c8de7df7352186bfe57994b5e7.zip | |
ASoC: tegra: add clk_prepare/clk_unprepare
Use clk_prepare/clk_unprepare as required by the generic clk framework.
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra/tegra30_i2s.c')
| -rw-r--r-- | sound/soc/tegra/tegra30_i2s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index 8596032985dc..d308faaae148 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -62,7 +62,7 @@ static int tegra30_i2s_runtime_suspend(struct device *dev) regcache_cache_only(i2s->regmap, true); - clk_disable(i2s->clk_i2s); + clk_disable_unprepare(i2s->clk_i2s); return 0; } @@ -72,7 +72,7 @@ static int tegra30_i2s_runtime_resume(struct device *dev) struct tegra30_i2s *i2s = dev_get_drvdata(dev); int ret; - ret = clk_enable(i2s->clk_i2s); + ret = clk_prepare_enable(i2s->clk_i2s); if (ret) { dev_err(dev, "clk_enable failed: %d\n", ret); return ret; |