From 45abf01abcf17272a0213c6af138b2e2760f1f0e Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 8 Oct 2012 15:11:21 +0200 Subject: [PATCH] --- yaml --- r: 338494 b: refs/heads/master c: 4534874a8720a361845dce47d310a98e9aac8aeb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-platform.c | 2 ++ trunk/include/linux/usb/ehci_pdriver.h | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e788022bb4e7..019646e6a36a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d39944ee85fb46cd499b16231cbb10a00e3d878 +refs/heads/master: 4534874a8720a361845dce47d310a98e9aac8aeb diff --git a/trunk/drivers/usb/host/ehci-platform.c b/trunk/drivers/usb/host/ehci-platform.c index 764e0100b6f4..607adf9adb83 100644 --- a/trunk/drivers/usb/host/ehci-platform.c +++ b/trunk/drivers/usb/host/ehci-platform.c @@ -38,6 +38,8 @@ static int ehci_platform_reset(struct usb_hcd *hcd) if (retval) return retval; + if (pdata->no_io_watchdog) + ehci->need_io_watchdog = 0; if (pdata->port_power_on) ehci_port_power(ehci, 1); if (pdata->port_power_off) diff --git a/trunk/include/linux/usb/ehci_pdriver.h b/trunk/include/linux/usb/ehci_pdriver.h index c9d09f8b7ff2..67ac74bde6d0 100644 --- a/trunk/include/linux/usb/ehci_pdriver.h +++ b/trunk/include/linux/usb/ehci_pdriver.h @@ -29,6 +29,8 @@ * initialization. * @port_power_off: set to 1 if the controller needs to be powered down * after initialization. + * @no_io_watchdog: set to 1 if the controller does not need the I/O + * watchdog to run. * * These are general configuration options for the EHCI controller. All of * these options are activating more or less workarounds for some hardware. @@ -41,6 +43,7 @@ struct usb_ehci_pdata { unsigned big_endian_mmio:1; unsigned port_power_on:1; unsigned port_power_off:1; + unsigned no_io_watchdog:1; /* Turn on all power and clocks */ int (*power_on)(struct platform_device *pdev);