USB: ehci-tegra: add clk_prepare/clk_unprepare

Use clk_prepare/clk_unprepare as required by the generic clk framework.

Cc: stern@rowland.harvard.edu
Cc: gregkh@linuxfoundation.org
Cc: linux-usb@vger.kernel.org
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 68548236ec4228ceb224d69845daba6345bf9971..ab8a3bf628e3480cc197e3e2c2e1ea32667bb85d 100644 (file)
--- 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);