[U-Boot] [PATCH v10 10/10] usb: host: ohci-generic: add generic PHY support

patrice.chotard at st.com patrice.chotard at st.com
Thu Jul 6 07:42:31 UTC 2017


From: Patrice Chotard <patrice.chotard at st.com>

Extend ohci-generic driver with generic PHY framework

Signed-off-by: Patrice Chotard <patrice.chotard at st.com>
Reviewed-by: Simon Glass <sjg at chromium.org>
---

v10:	_ none

v9:	_ none

v8:	_ rework error path by propagating the initial error code until the end of probe()

v7:	_ none

v6:	_ none

v5:	_ none

v4:	_ use generic_phy_valid() before generic_phy_exit() call

v3:	_ extract in this patch the PHY support add-on from previous patch 5

 drivers/usb/host/ohci-generic.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c
index 95d54c1..9249039 100644
--- 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 */
 };
@@ -83,12 +85,33 @@ static int ohci_usb_probe(struct udevice *dev)
 		goto clk_err;
 	}
 
+	err = generic_phy_get_by_index(dev, 0, &priv->phy);
+	if (err) {
+		if (err != -ENOENT) {
+			error("failed to get usb phy\n");
+			goto reset_err;
+		}
+	}
+
+	err = generic_phy_init(&priv->phy);
+	if (err) {
+		error("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)
+			error("failed to release phy\n");
+	}
+
 reset_err:
 	ret = reset_release_all(priv->resets, priv->reset_count);
 	if (ret)
@@ -110,6 +133,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;
-- 
1.9.1



More information about the U-Boot mailing list