mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
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>
This commit is contained in:
parent
61c3b1971a
commit
65d2bdd343
5 changed files with 16 additions and 16 deletions
|
@ -62,7 +62,7 @@ static int tegra20_i2s_runtime_suspend(struct device *dev)
|
|||
{
|
||||
struct tegra20_i2s *i2s = dev_get_drvdata(dev);
|
||||
|
||||
clk_disable(i2s->clk_i2s);
|
||||
clk_disable_unprepare(i2s->clk_i2s);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -72,7 +72,7 @@ static int tegra20_i2s_runtime_resume(struct device *dev)
|
|||
struct tegra20_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;
|
||||
|
|
|
@ -54,7 +54,7 @@ static int tegra20_spdif_runtime_suspend(struct device *dev)
|
|||
{
|
||||
struct tegra20_spdif *spdif = dev_get_drvdata(dev);
|
||||
|
||||
clk_disable(spdif->clk_spdif_out);
|
||||
clk_disable_unprepare(spdif->clk_spdif_out);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -64,7 +64,7 @@ static int tegra20_spdif_runtime_resume(struct device *dev)
|
|||
struct tegra20_spdif *spdif = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
|
||||
ret = clk_enable(spdif->clk_spdif_out);
|
||||
ret = clk_prepare_enable(spdif->clk_spdif_out);
|
||||
if (ret) {
|
||||
dev_err(dev, "clk_enable failed: %d\n", ret);
|
||||
return ret;
|
||||
|
|
|
@ -56,8 +56,8 @@ static int tegra30_ahub_runtime_suspend(struct device *dev)
|
|||
regcache_cache_only(ahub->regmap_apbif, true);
|
||||
regcache_cache_only(ahub->regmap_ahub, true);
|
||||
|
||||
clk_disable(ahub->clk_apbif);
|
||||
clk_disable(ahub->clk_d_audio);
|
||||
clk_disable_unprepare(ahub->clk_apbif);
|
||||
clk_disable_unprepare(ahub->clk_d_audio);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -77,12 +77,12 @@ static int tegra30_ahub_runtime_resume(struct device *dev)
|
|||
{
|
||||
int ret;
|
||||
|
||||
ret = clk_enable(ahub->clk_d_audio);
|
||||
ret = clk_prepare_enable(ahub->clk_d_audio);
|
||||
if (ret) {
|
||||
dev_err(dev, "clk_enable d_audio failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
ret = clk_enable(ahub->clk_apbif);
|
||||
ret = clk_prepare_enable(ahub->clk_apbif);
|
||||
if (ret) {
|
||||
dev_err(dev, "clk_enable apbif failed: %d\n", ret);
|
||||
clk_disable(ahub->clk_d_audio);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -69,9 +69,9 @@ int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate,
|
|||
data->set_baseclock = 0;
|
||||
data->set_mclk = 0;
|
||||
|
||||
clk_disable(data->clk_cdev1);
|
||||
clk_disable(data->clk_pll_a_out0);
|
||||
clk_disable(data->clk_pll_a);
|
||||
clk_disable_unprepare(data->clk_cdev1);
|
||||
clk_disable_unprepare(data->clk_pll_a_out0);
|
||||
clk_disable_unprepare(data->clk_pll_a);
|
||||
|
||||
err = clk_set_rate(data->clk_pll_a, new_baseclock);
|
||||
if (err) {
|
||||
|
@ -87,19 +87,19 @@ int tegra_asoc_utils_set_rate(struct tegra_asoc_utils_data *data, int srate,
|
|||
|
||||
/* Don't set cdev1/extern1 rate; it's locked to pll_a_out0 */
|
||||
|
||||
err = clk_enable(data->clk_pll_a);
|
||||
err = clk_prepare_enable(data->clk_pll_a);
|
||||
if (err) {
|
||||
dev_err(data->dev, "Can't enable pll_a: %d\n", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
err = clk_enable(data->clk_pll_a_out0);
|
||||
err = clk_prepare_enable(data->clk_pll_a_out0);
|
||||
if (err) {
|
||||
dev_err(data->dev, "Can't enable pll_a_out0: %d\n", err);
|
||||
return err;
|
||||
}
|
||||
|
||||
err = clk_enable(data->clk_cdev1);
|
||||
err = clk_prepare_enable(data->clk_cdev1);
|
||||
if (err) {
|
||||
dev_err(data->dev, "Can't enable cdev1: %d\n", err);
|
||||
return err;
|
||||
|
|
Loading…
Reference in a new issue