From: Patrice Chotard <patrice.chotard@st.com>
Date: Wed, 14 Mar 2018 16:48:53 +0000 (+0100)
Subject: usb: ehci-generic: handle phy power on/off
X-Git-Tag: v2018.05-rc1~29^2~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a800a6793f095746173834ead6b3663bc3c0542c;p=u-boot

usb: ehci-generic: handle phy power on/off

Add generic_phy_power_on() and generic_phy_power_off()
calls to switch ON/OFF phy during probe and remove functions.

Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---

diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
index 1cb92c0338..2edd6d7433 100644
--- a/drivers/usb/host/ehci-generic.c
+++ b/drivers/usb/host/ehci-generic.c
@@ -106,6 +106,12 @@ static int ehci_usb_probe(struct udevice *dev)
 			pr_err("failed to init usb phy\n");
 			goto reset_err;
 		}
+
+		err = generic_phy_power_on(&priv->phy);
+		if (err) {
+			dev_err(dev, "failed to power on usb phy\n");
+			goto phy_power_err;
+		}
 	}
 
 	hccr = map_physmem(dev_read_addr(dev), 0x100, MAP_NOCACHE);
@@ -119,6 +125,13 @@ static int ehci_usb_probe(struct udevice *dev)
 	return 0;
 
 phy_err:
+	if (generic_phy_valid(&priv->phy)) {
+		ret = generic_phy_power_off(&priv->phy);
+		if (ret)
+			dev_err(dev, "failed to power off usb phy\n");
+	}
+
+phy_power_err:
 	if (generic_phy_valid(&priv->phy)) {
 		ret = generic_phy_exit(&priv->phy);
 		if (ret)
@@ -147,6 +160,10 @@ static int ehci_usb_remove(struct udevice *dev)
 		return ret;
 
 	if (generic_phy_valid(&priv->phy)) {
+		ret = generic_phy_power_off(&priv->phy);
+		if (ret)
+			return ret;
+
 		ret = generic_phy_exit(&priv->phy);
 		if (ret)
 			return ret;