Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / usb / host / ohci-generic.c

diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c
index 95d54c1f098bf15238886347e93fc11bff4ae6a6..bf55a71d66c22fb09ea5bd7ac5a15664d51b5b57 100644 (file)
--- a/drivers/usb/host/ohci-generic.c
+++ b/drivers/usb/host/ohci-generic.c
@@ -8,6 +8,7 @@
 #include <clk.h>
 #include <dm.h>
 #include <dm/ofnode.h>
+#include <generic-phy.h>
 #include <reset.h>
 #include "ohci.h"
 
@@ -19,6 +20,7 @@ struct generic_ohci {
        ohci_t ohci;
        struct clk *clocks;     /* clock list */
        struct reset_ctl *resets; /* reset list */
+       struct phy phy;
        int clock_count;        /* number of clock in clock list */
        int reset_count;        /* number of reset in reset list */
 };
@@ -45,14 +47,14 @@ static int ohci_usb_probe(struct udevice *dev)
 
                        err = clk_enable(&priv->clocks[i]);
                        if (err) {
-                               error("failed to enable clock %d\n", i);
+                               pr_err("failed to enable clock %d\n", i);
                                clk_free(&priv->clocks[i]);
                                goto clk_err;
                        }
                        priv->clock_count++;
                }
        } else if (clock_nb != -ENOENT) {
-               error("failed to get clock phandle(%d)\n", clock_nb);
+               pr_err("failed to get clock phandle(%d)\n", clock_nb);
                return clock_nb;
        }
 
@@ -72,31 +74,53 @@ static int ohci_usb_probe(struct udevice *dev)
 
                        err = reset_deassert(&priv->resets[i]);
                        if (err) {
-                               error("failed to deassert reset %d\n", i);
+                               pr_err("failed to deassert reset %d\n", i);
                                reset_free(&priv->resets[i]);
                                goto reset_err;
                        }
                        priv->reset_count++;
                }
        } else if (reset_nb != -ENOENT) {
-               error("failed to get reset phandle(%d)\n", reset_nb);
+               pr_err("failed to get reset phandle(%d)\n", reset_nb);
                goto clk_err;
        }
 
+       err = generic_phy_get_by_index(dev, 0, &priv->phy);
+       if (err) {
+               if (err != -ENOENT) {
+                       pr_err("failed to get usb phy\n");
+                       goto reset_err;
+               }
+       } else {
+
+               err = generic_phy_init(&priv->phy);
+               if (err) {
+                       pr_err("failed to init usb phy\n");
+                       goto reset_err;
+               }
+       }
+
        err = ohci_register(dev, regs);
        if (err)
-               goto reset_err;
+               goto phy_err;
 
        return 0;
 
+phy_err:
+       if (generic_phy_valid(&priv->phy)) {
+               ret = generic_phy_exit(&priv->phy);
+               if (ret)
+                       pr_err("failed to release phy\n");
+       }
+
 reset_err:
        ret = reset_release_all(priv->resets, priv->reset_count);
        if (ret)
-               error("failed to assert all resets\n");
+               pr_err("failed to assert all resets\n");
 clk_err:
        ret = clk_release_all(priv->clocks, priv->clock_count);
        if (ret)
-               error("failed to disable all clocks\n");
+               pr_err("failed to disable all clocks\n");
 
        return err;
 }
@@ -110,6 +134,12 @@ static int ohci_usb_remove(struct udevice *dev)
        if (ret)
                return ret;
 
+       if (generic_phy_valid(&priv->phy)) {
+               ret = generic_phy_exit(&priv->phy);
+               if (ret)
+                       return ret;
+       }
+
        ret = reset_release_all(priv->resets, priv->reset_count);
        if (ret)
                return ret;