diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-10-08 09:11:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-22 14:15:47 -0400 |
commit | 4534874a8720a361845dce47d310a98e9aac8aeb (patch) | |
tree | 5eb0a1d92af8eac4d813d68dc66992f5a063b8eb /include/linux/usb/ehci_pdriver.h | |
parent | 6d39944ee85fb46cd499b16231cbb10a00e3d878 (diff) |
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>
Diffstat (limited to 'include/linux/usb/ehci_pdriver.h')
-rw-r--r-- | include/linux/usb/ehci_pdriver.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ | |||
29 | * initialization. | 29 | * initialization. |
30 | * @port_power_off: set to 1 if the controller needs to be powered down | 30 | * @port_power_off: set to 1 if the controller needs to be powered down |
31 | * after initialization. | 31 | * after initialization. |
32 | * @no_io_watchdog: set to 1 if the controller does not need the I/O | ||
33 | * watchdog to run. | ||
32 | * | 34 | * |
33 | * These are general configuration options for the EHCI controller. All of | 35 | * These are general configuration options for the EHCI controller. All of |
34 | * these options are activating more or less workarounds for some hardware. | 36 | * these options are activating more or less workarounds for some hardware. |
@@ -41,6 +43,7 @@ struct usb_ehci_pdata { | |||
41 | unsigned big_endian_mmio:1; | 43 | unsigned big_endian_mmio:1; |
42 | unsigned port_power_on:1; | 44 | unsigned port_power_on:1; |
43 | unsigned port_power_off:1; | 45 | unsigned port_power_off:1; |
46 | unsigned no_io_watchdog:1; | ||
44 | 47 | ||
45 | /* Turn on all power and clocks */ | 48 | /* Turn on all power and clocks */ |
46 | int (*power_on)(struct platform_device *pdev); | 49 | int (*power_on)(struct platform_device *pdev); |