USB: EHCI: add no_io_watchdog platform_data parameter to ehci-platform

Enhance the ehci-platform driver to also accept no_io_watchdog as a platform
data parameter. When no_io_watchdog is set to 1, the ehci controller will set
ehci->need_io_watchdog to 0. Since most EHCI controllers do need the I/O
watchdog to be on, only let those which need it to turn the watchdog off.

Make sure that we change need_io_watchdog after the call to ehci_setup()
because ehci_setup() will unconditionnaly set need_io_watchdog to 1.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 764e0100b6f438d82ab64057e8cb37abd638fa79..607adf9adb8309b60dd2ff19deb17d5632039908 100644 (file)
--- 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 c9d09f8b7ff2d66579ee58700658667347ef8094..67ac74bde6d0d533bb36e12697e424ddfb69e2b6 100644 (file)
--- 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);