leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume

Browse Source 
This patch fixes an issue that a usb 1.1 device is not connected in
system resume and then the following message appeared if debug messages
are enabled:
	usb 2-1: Waited 2000ms for CONNECT

To resolve this issue, the EHCI controller must be resumed after its
companion controllers. So, this patch adds such code on the driver.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Yoshihiro Shimoda 2017-02-21 19:59:48 +09:00 committed by Greg Kroah-Hartman
parent 5095cb89c6
commit d4d75128b8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/host/ehci-platform.c
View File

@ -34,6 +34,7 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/hcd.h> #include <linux/usb/hcd.h>
#include <linux/usb/ehci_pdriver.h> #include <linux/usb/ehci_pdriver.h>
#include <linux/usb/of.h>
#include "ehci.h" #include "ehci.h"
@ -297,6 +298,7 @@ static int ehci_platform_probe(struct platform_device *dev)
goto err_power; goto err_power;
device_wakeup_enable(hcd->self.controller); device_wakeup_enable(hcd->self.controller);
device_enable_async_suspend(hcd->self.controller);
platform_set_drvdata(dev, hcd); platform_set_drvdata(dev, hcd);
return err; return err;
@ -370,6 +372,7 @@ static int ehci_platform_resume(struct device *dev)
struct usb_ehci_pdata *pdata = dev_get_platdata(dev); struct usb_ehci_pdata *pdata = dev_get_platdata(dev);
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
struct device *companion_dev;
if (pdata->power_on) { if (pdata->power_on) {
int err = pdata->power_on(pdev); int err = pdata->power_on(pdev);
@ -377,6 +380,10 @@ static int ehci_platform_resume(struct device *dev)
return err; return err;
} }
companion_dev = usb_of_get_companion_dev(hcd->self.controller);
if (companion_dev)
device_pm_wait_for_dev(hcd->self.controller, companion_dev);
ehci_resume(hcd, priv->reset_on_resume); ehci_resume(hcd, priv->reset_on_resume);
return 0; return 0;
} }