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>

7 files changed, 32 insertions, 32 deletions

diff --git a/drivers/crypto/tegra-aes.c b/drivers/crypto/tegra-aes.c
index 422a9766c7c9..ac236f6724f4 100644
--- a/drivers/crypto/tegra-aes.c
+++ b/drivers/crypto/tegra-aes.c
@@ -572,7 +572,7 @@ static void aes_workqueue_handler(struct work_struct *work)
         struct tegra_aes_dev *dd = aes_dev;
         int ret;
 
-        ret = clk_enable(dd->aes_clk);
+        ret = clk_prepare_enable(dd->aes_clk);
         if (ret)
                 BUG_ON("clock enable failed");
 
@@ -581,7 +581,7 @@ static void aes_workqueue_handler(struct work_struct *work)
                 ret = tegra_aes_handle_req(dd);
         } while (!ret);
 
-        clk_disable(dd->aes_clk);
+        clk_disable_unprepare(dd->aes_clk);
 }
 
 static irqreturn_t aes_irq(int irq, void *dev_id)
@@ -673,7 +673,7 @@ static int tegra_aes_get_random(struct crypto_rng *tfm, u8 *rdata,
         /* take mutex to access the aes hw */
         mutex_lock(&aes_lock);
 
-        ret = clk_enable(dd->aes_clk);
+        ret = clk_prepare_enable(dd->aes_clk);
         if (ret)
                 return ret;
 
@@ -700,7 +700,7 @@ static int tegra_aes_get_random(struct crypto_rng *tfm, u8 *rdata,
         }
 
 out:
-        clk_disable(dd->aes_clk);
+        clk_disable_unprepare(dd->aes_clk);
         mutex_unlock(&aes_lock);
 
         dev_dbg(dd->dev, "%s: done\n", __func__);
@@ -758,7 +758,7 @@ static int tegra_aes_rng_reset(struct crypto_rng *tfm, u8 *seed,
 
         dd->flags = FLAGS_ENCRYPT | FLAGS_RNG;
 
-        ret = clk_enable(dd->aes_clk);
+        ret = clk_prepare_enable(dd->aes_clk);
         if (ret)
                 return ret;
 
@@ -788,7 +788,7 @@ static int tegra_aes_rng_reset(struct crypto_rng *tfm, u8 *seed,
         memcpy(dd->dt, dt, DEFAULT_RNG_BLK_SZ);
 
 out:
-        clk_disable(dd->aes_clk);
+        clk_disable_unprepare(dd->aes_clk);
         mutex_unlock(&aes_lock);
 
         dev_dbg(dd->dev, "%s: done\n", __func__);
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 8b2e555a9563..3da7ee3eb505 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -341,7 +341,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
         u32 val;
         int err = 0;
 
-        clk_enable(i2c_dev->clk);
+        clk_prepare_enable(i2c_dev->clk);
 
         tegra_periph_reset_assert(i2c_dev->clk);
         udelay(2);
@@ -372,7 +372,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
         if (tegra_i2c_flush_fifos(i2c_dev))
                 err = -ETIMEDOUT;
 
-        clk_disable(i2c_dev->clk);
+        clk_disable_unprepare(i2c_dev->clk);
 
         if (i2c_dev->irq_disabled) {
                 i2c_dev->irq_disabled = 0;
@@ -546,14 +546,14 @@ static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
         if (i2c_dev->is_suspended)
                 return -EBUSY;
 
-        clk_enable(i2c_dev->clk);
+        clk_prepare_enable(i2c_dev->clk);
         for (i = 0; i < num; i++) {
                 int stop = (i == (num - 1)) ? 1  : 0;
                 ret = tegra_i2c_xfer_msg(i2c_dev, &msgs[i], stop);
                 if (ret)
                         break;
         }
-        clk_disable(i2c_dev->clk);
+        clk_disable_unprepare(i2c_dev->clk);
         return ret ?: i;
 }
 
@@ -666,7 +666,7 @@ static int __devinit tegra_i2c_probe(struct platform_device *pdev)
                 goto err_free;
         }
 
-        clk_enable(i2c_dev->i2c_clk);
+        clk_prepare_enable(i2c_dev->i2c_clk);
 
         i2c_set_adapdata(&i2c_dev->adapter, i2c_dev);
         i2c_dev->adapter.owner = THIS_MODULE;
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 4ffe64d53107..2c1c9ed1bd9f 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -492,7 +492,7 @@ static int tegra_kbc_start(struct tegra_kbc *kbc)
         unsigned int debounce_cnt;
         u32 val = 0;
 
-        clk_enable(kbc->clk);
+        clk_prepare_enable(kbc->clk);
 
         /* Reset the KBC controller to clear all previous status.*/
         tegra_periph_reset_assert(kbc->clk);
@@ -556,7 +556,7 @@ static void tegra_kbc_stop(struct tegra_kbc *kbc)
         disable_irq(kbc->irq);
         del_timer_sync(&kbc->timer);
 
-        clk_disable(kbc->clk);
+        clk_disable_unprepare(kbc->clk);
 }
 
 static int tegra_kbc_open(struct input_dev *dev)
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 6e5338a071ce..0810ccc23d7e 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -337,7 +337,7 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
                 rc = PTR_ERR(clk);
                 goto err_clk_get;
         }
-        clk_enable(clk);
+        clk_prepare_enable(clk);
         pltfm_host->clk = clk;
 
         host->mmc->pm_caps = plat->pm_flags;
@@ -352,7 +352,7 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
         return 0;
 
 err_add_host:
-        clk_disable(pltfm_host->clk);
+        clk_disable_unprepare(pltfm_host->clk);
         clk_put(pltfm_host->clk);
 err_clk_get:
         if (gpio_is_valid(plat->wp_gpio))
@@ -393,7 +393,7 @@ static int __devexit sdhci_tegra_remove(struct platform_device *pdev)
         if (gpio_is_valid(plat->power_gpio))
                 gpio_free(plat->power_gpio);
 
-        clk_disable(pltfm_host->clk);
+        clk_disable_unprepare(pltfm_host->clk);
         clk_put(pltfm_host->clk);
 
         sdhci_pltfm_free(pdev);
diff --git a/drivers/spi/spi-tegra.c b/drivers/spi/spi-tegra.c
index ae6d78a3e912..7f99ff3553a6 100644
--- a/drivers/spi/spi-tegra.c
+++ b/drivers/spi/spi-tegra.c
@@ -261,7 +261,7 @@ static void spi_tegra_start_transfer(struct spi_device *spi,
                 clk_set_rate(tspi->clk, speed);
 
         if (tspi->cur_speed == 0)
-                clk_enable(tspi->clk);
+                clk_prepare_enable(tspi->clk);
 
         tspi->cur_speed = speed;
 
@@ -373,7 +373,7 @@ static void tegra_spi_rx_dma_complete(struct tegra_dma_req *req)
                         spi = m->state;
                         spi_tegra_start_message(spi, m);
                 } else {
-                        clk_disable(tspi->clk);
+                        clk_disable_unprepare(tspi->clk);
                         tspi->cur_speed = 0;
                 }
         }
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 3c60088871e0..9356886f489b 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -675,7 +675,7 @@ static void tegra_init_i2c_slave(struct nvec_chip *nvec)
 {
         u32 val;
 
-        clk_enable(nvec->i2c_clk);
+        clk_prepare_enable(nvec->i2c_clk);
 
         tegra_periph_reset_assert(nvec->i2c_clk);
         udelay(2);
@@ -695,14 +695,14 @@ static void tegra_init_i2c_slave(struct nvec_chip *nvec)
 
         enable_irq(nvec->irq);
 
-        clk_disable(nvec->i2c_clk);
+        clk_disable_unprepare(nvec->i2c_clk);
 }
 
 static void nvec_disable_i2c_slave(struct nvec_chip *nvec)
 {
         disable_irq(nvec->irq);
         writel(I2C_SL_NEWSL | I2C_SL_NACK, nvec->base + I2C_SL_CNFG);
-        clk_disable(nvec->i2c_clk);
+        clk_disable_unprepare(nvec->i2c_clk);
 }
 
 static void nvec_power_off(void)
@@ -812,7 +812,7 @@ static int __devinit tegra_nvec_probe(struct platform_device *pdev)
 
         tegra_init_i2c_slave(nvec);
 
-        clk_enable(i2c_clk);
+        clk_prepare_enable(i2c_clk);
 
 
         /* enable event reporting */
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 68548236ec42..ab8a3bf628e3 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -46,8 +46,8 @@ static void tegra_ehci_power_up(struct usb_hcd *hcd)
 {
         struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
 
-        clk_enable(tegra->emc_clk);
-        clk_enable(tegra->clk);
+        clk_prepare_enable(tegra->emc_clk);
+        clk_prepare_enable(tegra->clk);
         tegra_usb_phy_power_on(tegra->phy);
         tegra->host_resumed = 1;
 }
@@ -58,8 +58,8 @@ static void tegra_ehci_power_down(struct usb_hcd *hcd)
 
         tegra->host_resumed = 0;
         tegra_usb_phy_power_off(tegra->phy);
-        clk_disable(tegra->clk);
-        clk_disable(tegra->emc_clk);
+        clk_disable_unprepare(tegra->clk);
+        clk_disable_unprepare(tegra->emc_clk);
 }
 
 static int tegra_ehci_internal_port_reset(
@@ -671,7 +671,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                 goto fail_clk;
         }
 
-        err = clk_enable(tegra->clk);
+        err = clk_prepare_enable(tegra->clk);
         if (err)
                 goto fail_clken;
 
@@ -682,7 +682,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                 goto fail_emc_clk;
         }
 
-        clk_enable(tegra->emc_clk);
+        clk_prepare_enable(tegra->emc_clk);
         clk_set_rate(tegra->emc_clk, 400000000);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -782,10 +782,10 @@ fail:
 fail_phy:
         iounmap(hcd->regs);
 fail_io:
-        clk_disable(tegra->emc_clk);
+        clk_disable_unprepare(tegra->emc_clk);
         clk_put(tegra->emc_clk);
 fail_emc_clk:
-        clk_disable(tegra->clk);
+        clk_disable_unprepare(tegra->clk);
 fail_clken:
         clk_put(tegra->clk);
 fail_clk:
@@ -820,10 +820,10 @@ static int tegra_ehci_remove(struct platform_device *pdev)
         tegra_usb_phy_close(tegra->phy);
         iounmap(hcd->regs);
 
-        clk_disable(tegra->clk);
+        clk_disable_unprepare(tegra->clk);
         clk_put(tegra->clk);
 
-        clk_disable(tegra->emc_clk);
+        clk_disable_unprepare(tegra->emc_clk);
         clk_put(tegra->emc_clk);
 
         kfree(tegra);