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>

1 files changed, 10 insertions, 10 deletions

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);