Merge branch 'for-3.6/common-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/clk

From Stephen Warren <swarren@wwwdotorg.org>:

This branch contains numerous changes required as a baseline in order to
convert Tegra to the common clock framework. The intention was to also
include patches to actually convert Tegra to the common clock framework.
However, those patches appeared late in the kernel cycle and currently
cause regressions on some boards, so were dropped for now.

* 'for-3.6/common-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: Provide clock for only one PWM controller
  ARM: tegra: Fix PWM clock programming
  ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"
  ARM: tegra: Remove second instance of uart clk
  crypto: add clk_prepare/clk_unprepare
  ASoC: tegra: add clk_prepare/clk_unprepare
  staging: nvec: add clk_prepare/clk_unprepare
  spi/tegra: add clk_prepare/clk_unprepare
  Input: tegra-kbc - add clk_prepare/clk_unprepare
  USB: ehci-tegra: add clk_prepare/clk_unprepare
  mmc: tegra: add clk_prepare/clk_unprepare
  i2c: tegra: Add clk_prepare/clk_unprepare
  ARM: tegra: add clk_prepare/clk_unprepare

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

5 files changed, 16 insertions, 16 deletions

diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index 0c7af63d444b..1647dbfe74b5 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -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;
diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index f9b57418bd08..2262e4fdec2a 100644
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -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;
diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index f43edb364a18..bf5610122c76 100644
--- a/sound/soc/tegra/tegra30_ahub.c
+++ b/sound/soc/tegra/tegra30_ahub.c
@@ -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);
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;
diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c
index 9515ce58ea02..6872c77a1196 100644
--- a/sound/soc/tegra/tegra_asoc_utils.c
+++ b/sound/soc/tegra/tegra_asoc_utils.c
@@ -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;