2 files changed, 43 insertions, 35 deletions

diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index a797d51ecbe8..c778ffe4e4e5 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -32,7 +32,7 @@
 #define ULPI_VIEWPORT_OFFSET    0x170
 
 struct ehci_mxc_priv {
-        struct clk *usbclk, *ahbclk, *phy1clk;
+        struct clk *usbclk, *ahbclk, *phyclk;
         struct usb_hcd *hcd;
 };
 
@@ -166,31 +166,26 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
         }
 
         /* enable clocks */
-        priv->usbclk = clk_get(dev, "usb");
+        priv->usbclk = clk_get(dev, "ipg");
         if (IS_ERR(priv->usbclk)) {
                 ret = PTR_ERR(priv->usbclk);
                 goto err_clk;
         }
-        clk_enable(priv->usbclk);
+        clk_prepare_enable(priv->usbclk);
 
-        if (!cpu_is_mx35() && !cpu_is_mx25()) {
-                priv->ahbclk = clk_get(dev, "usb_ahb");
-                if (IS_ERR(priv->ahbclk)) {
-                        ret = PTR_ERR(priv->ahbclk);
-                        goto err_clk_ahb;
-                }
-                clk_enable(priv->ahbclk);
+        priv->ahbclk = clk_get(dev, "ahb");
+        if (IS_ERR(priv->ahbclk)) {
+                ret = PTR_ERR(priv->ahbclk);
+                goto err_clk_ahb;
         }
+        clk_prepare_enable(priv->ahbclk);
 
         /* "dr" device has its own clock on i.MX51 */
-        if (cpu_is_mx51() && (pdev->id == 0)) {
-                priv->phy1clk = clk_get(dev, "usb_phy1");
-                if (IS_ERR(priv->phy1clk)) {
-                        ret = PTR_ERR(priv->phy1clk);
-                        goto err_clk_phy;
-                }
-                clk_enable(priv->phy1clk);
-        }
+        priv->phyclk = clk_get(dev, "phy");
+        if (IS_ERR(priv->phyclk))
+                priv->phyclk = NULL;
+        if (priv->phyclk)
+                clk_prepare_enable(priv->phyclk);
 
 
         /* call platform specific init function */
@@ -265,17 +260,15 @@ err_add:
         if (pdata && pdata->exit)
                 pdata->exit(pdev);
 err_init:
-        if (priv->phy1clk) {
-                clk_disable(priv->phy1clk);
-                clk_put(priv->phy1clk);
-        }
-err_clk_phy:
-        if (priv->ahbclk) {
-                clk_disable(priv->ahbclk);
-                clk_put(priv->ahbclk);
+        if (priv->phyclk) {
+                clk_disable_unprepare(priv->phyclk);
+                clk_put(priv->phyclk);
         }
+
+        clk_disable_unprepare(priv->ahbclk);
+        clk_put(priv->ahbclk);
 err_clk_ahb:
-        clk_disable(priv->usbclk);
+        clk_disable_unprepare(priv->usbclk);
         clk_put(priv->usbclk);
 err_clk:
         iounmap(hcd->regs);
@@ -307,15 +300,14 @@ static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)
         usb_put_hcd(hcd);
         platform_set_drvdata(pdev, NULL);
 
-        clk_disable(priv->usbclk);
+        clk_disable_unprepare(priv->usbclk);
         clk_put(priv->usbclk);
-        if (priv->ahbclk) {
-                clk_disable(priv->ahbclk);
-                clk_put(priv->ahbclk);
-        }
-        if (priv->phy1clk) {
-                clk_disable(priv->phy1clk);
-                clk_put(priv->phy1clk);
+        clk_disable_unprepare(priv->ahbclk);
+        clk_put(priv->ahbclk);
+
+        if (priv->phyclk) {
+                clk_disable_unprepare(priv->phyclk);
+                clk_put(priv->phyclk);
         }
 
         kfree(priv);
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 6c6a5a3b4ea7..82de1073aa52 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mbus.h>
+#include <linux/clk.h>
 #include <plat/ehci-orion.h>
 
 #define rdl(off)        __raw_readl(hcd->regs + (off))
@@ -198,6 +199,7 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
         struct resource *res;
         struct usb_hcd *hcd;
         struct ehci_hcd *ehci;
+        struct clk *clk;
         void __iomem *regs;
         int irq, err;
 
@@ -238,6 +240,14 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
                 goto err2;
         }
 
+        /* Not all platforms can gate the clock, so it is not
+           an error if the clock does not exists. */
+        clk = clk_get(&pdev->dev, NULL);
+        if (!IS_ERR(clk)) {
+                clk_prepare_enable(clk);
+                clk_put(clk);
+        }
+
         hcd = usb_create_hcd(&ehci_orion_hc_driver,
                         &pdev->dev, dev_name(&pdev->dev));
         if (!hcd) {
@@ -301,12 +311,18 @@ err1:
 static int __exit ehci_orion_drv_remove(struct platform_device *pdev)
 {
         struct usb_hcd *hcd = platform_get_drvdata(pdev);
+        struct clk *clk;
 
         usb_remove_hcd(hcd);
         iounmap(hcd->regs);
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
         usb_put_hcd(hcd);
 
+        clk = clk_get(&pdev->dev, NULL);
+        if (!IS_ERR(clk)) {
+                clk_disable_unprepare(clk);
+                clk_put(clk);
+        }
         return 0;
 }