102cb4742c
Refresh patches on all 4.4 supported platforms. 077-0005-bgmac-stop-clearing-DMA-receive-control-register-rig.patch removed as now upstream. Compile & run tested: ar71xx - Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
68 lines
1.9 KiB
Diff
68 lines
1.9 KiB
Diff
From 5c4ad318de3b8e8680d654c82a254c4b65243739 Mon Sep 17 00:00:00 2001
|
|
From: Felipe Balbi <balbi@kernel.org>
|
|
Date: Mon, 11 Apr 2016 17:12:34 +0300
|
|
Subject: usb: dwc3: core: fix PHY handling during suspend
|
|
|
|
we need to power off the PHY during suspend and
|
|
power it back on during resume.
|
|
|
|
Signed-off-by: Felipe Balbi <balbi@kernel.org>
|
|
[nsekhar@ti.com: fix call to usb_phy_set_suspend() in dwc3_suspend()]
|
|
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
|
|
Signed-off-by: Roger Quadros <rogerq@ti.com>
|
|
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
|
|
---
|
|
drivers/usb/dwc3/core.c | 23 ++++++++++++++++++++++-
|
|
1 file changed, 22 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/usb/dwc3/core.c
|
|
+++ b/drivers/usb/dwc3/core.c
|
|
@@ -1124,6 +1124,11 @@ static int dwc3_suspend(struct device *d
|
|
phy_exit(dwc->usb2_generic_phy);
|
|
phy_exit(dwc->usb3_generic_phy);
|
|
|
|
+ usb_phy_set_suspend(dwc->usb2_phy, 1);
|
|
+ usb_phy_set_suspend(dwc->usb3_phy, 1);
|
|
+ WARN_ON(phy_power_off(dwc->usb2_generic_phy) < 0);
|
|
+ WARN_ON(phy_power_off(dwc->usb3_generic_phy) < 0);
|
|
+
|
|
pinctrl_pm_select_sleep_state(dev);
|
|
|
|
return 0;
|
|
@@ -1137,11 +1142,21 @@ static int dwc3_resume(struct device *de
|
|
|
|
pinctrl_pm_select_default_state(dev);
|
|
|
|
+ usb_phy_set_suspend(dwc->usb2_phy, 0);
|
|
+ usb_phy_set_suspend(dwc->usb3_phy, 0);
|
|
+ ret = phy_power_on(dwc->usb2_generic_phy);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ ret = phy_power_on(dwc->usb3_generic_phy);
|
|
+ if (ret < 0)
|
|
+ goto err_usb2phy_power;
|
|
+
|
|
usb_phy_init(dwc->usb3_phy);
|
|
usb_phy_init(dwc->usb2_phy);
|
|
ret = phy_init(dwc->usb2_generic_phy);
|
|
if (ret < 0)
|
|
- return ret;
|
|
+ goto err_usb3phy_power;
|
|
|
|
ret = phy_init(dwc->usb3_generic_phy);
|
|
if (ret < 0)
|
|
@@ -1174,6 +1189,12 @@ static int dwc3_resume(struct device *de
|
|
err_usb2phy_init:
|
|
phy_exit(dwc->usb2_generic_phy);
|
|
|
|
+err_usb3phy_power:
|
|
+ phy_power_off(dwc->usb3_generic_phy);
|
|
+
|
|
+err_usb2phy_power:
|
|
+ phy_power_off(dwc->usb2_generic_phy);
|
|
+
|
|
return ret;
|
|
}
|
|
|