Avoiding phy powerdown when wakeup capable devices are connected.

Signed-off-by: Sandeep Maheswaram <s...@codeaurora.org>
---
 drivers/usb/dwc3/core.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 94fdbe5..9ecd7ac 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1702,7 +1702,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, 
pm_message_t msg)
                dwc3_core_exit(dwc);
                break;
        case DWC3_GCTL_PRTCAP_HOST:
-               if (!PMSG_IS_AUTO(msg)) {
+               if (!PMSG_IS_AUTO(msg) && dwc->phy_power_off) {
                        dwc3_core_exit(dwc);
                        break;
                }
@@ -1763,13 +1763,15 @@ static int dwc3_resume_common(struct dwc3 *dwc, 
pm_message_t msg)
                spin_unlock_irqrestore(&dwc->lock, flags);
                break;
        case DWC3_GCTL_PRTCAP_HOST:
-               if (!PMSG_IS_AUTO(msg)) {
+               if (!PMSG_IS_AUTO(msg) && dwc->phy_power_off) {
                        ret = dwc3_core_init_for_resume(dwc);
                        if (ret)
                                return ret;
                        dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST);
                        break;
-               }
+               } else
+                       dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST);
+
                /* Restore GUSB2PHYCFG bits that were modified in suspend */
                reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0));
                if (dwc->dis_u2_susphy_quirk)
-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Reply via email to