usb: host: ohci-platform: Add support for omap3 and later

With the runtime PM implemented for ohci-platform driver, we can
now support omap3 and later OHCI by adding one device tree
property.

Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/devicetree/bindings/usb/usb-ohci.txt b/Documentation/devicetree/bindings/usb/usb-ohci.txt
index 9df456968596fbbfebde061d13a21583dab233dc..e8766b08c93b9538366a4ef813b8479ad8700587 100644 (file)
--- a/Documentation/devicetree/bindings/usb/usb-ohci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-ohci.txt
@@ -10,6 +10,7 @@ Optional properties:
 - big-endian-desc : boolean, set this for hcds with big-endian descriptors
 - big-endian : boolean, for hcds with big-endian-regs + big-endian-desc
 - no-big-frame-no : boolean, set if frame_no lives in bits [15:0] of HCCA
+- remote-wakeup-connected: remote wakeup is wired on the platform
 - num-ports : u32, to override the detected port count
 - clocks : a list of phandle + clock specifier pairs
 - phys : phandle + phy specifier pair

diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index 589177dca8cabb78c56f0481e7c32b05ab156789..61fe2b985070f1f7dcad0fc46b143b367997f9a7 100644 (file)
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -164,6 +164,10 @@ static int ohci_platform_probe(struct platform_device *dev)
                if (of_property_read_bool(dev->dev.of_node, "no-big-frame-no"))
                        ohci->flags |= OHCI_QUIRK_FRAME_NO;
 
+               if (of_property_read_bool(dev->dev.of_node,
+                                         "remote-wakeup-connected"))
+                       ohci->hc_control = OHCI_CTRL_RWC;
+
                of_property_read_u32(dev->dev.of_node, "num-ports",
                                     &ohci->num_ports);
 
@@ -358,6 +362,7 @@ static int ohci_platform_resume(struct device *dev)
 static const struct of_device_id ohci_platform_ids[] = {
        { .compatible = "generic-ohci", },
        { .compatible = "cavium,octeon-6335-ohci", },
+       { .compatible = "ti,ohci-omap3", },
        { }
 };
 MODULE_DEVICE_TABLE(of, ohci_platform_ids);