2 files changed, 5 insertions, 0 deletions

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 764e0100b6f4..607adf9adb83 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/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/include/linux/usb/ehci_pdriver.h b/include/linux/usb/ehci_pdriver.h
index c9d09f8b7ff2..67ac74bde6d0 100644
--- a/include/linux/usb/ehci_pdriver.h
+++ b/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);