From dd2cdd82b87202f26f50415381acef29c801de88 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Wed, 12 Dec 2018 10:26:33 +0800 Subject: [PATCH] MLK-20569 usb: ehci-mx6: configure usb out of suspend state When moving to support partition reboot or android auto on XEN, linux kernel will runs into runtime suspend state, and the usb will be configured to low power suspend state by Linux. Then we reboot and runs into U-Boot, however the usb already in suspended state and uboot not able to lock the phy pll, after clearing PHCD to out of suspended state, the phy pll could be locked and fastboot works. Signed-off-by: Peng Fan Suggested-by: Li Jun Reviewed-by: Ye Li (cherry picked from commit 999ae3e37bc8fea05ac984eb043dd925d80f1208) --- drivers/usb/host/ehci-mx6.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index d04f703..f03dc9d 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -436,10 +436,17 @@ int __weak board_ehci_power(int port, int on) int ehci_mx6_common_init(struct usb_ehci *ehci, int index) { int ret; + u32 portsc; enable_usboh3_clk(1); mdelay(1); + portsc = readl(&ehci->portsc); + if (portsc & PORT_PTS_PHCD) { + debug("suspended: portsc %x, enabled it.\n", portsc); + clrbits_le32(&ehci->portsc, PORT_PTS_PHCD); + } + /* Do board specific initialization */ ret = board_ehci_hcd_init(index); if (ret) -- 1.9.1