ehci-platform: Add support for controllers with big-endian regs / descriptors
authorHans de Goede <hdegoede@redhat.com>
Fri, 7 Feb 2014 15:36:43 +0000 (16:36 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Feb 2014 22:24:24 +0000 (14:24 -0800)
This uses the already documented devicetree booleans for this, see:
Documentation/devicetree/bindings/usb/usb-ehci.txt

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ehci-platform.c

index 5ebd0b7..8fde649 100644 (file)
@@ -55,8 +55,10 @@ static int ehci_platform_reset(struct usb_hcd *hcd)
 
        hcd->has_tt = pdata->has_tt;
        ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug;
-       ehci->big_endian_desc = pdata->big_endian_desc;
-       ehci->big_endian_mmio = pdata->big_endian_mmio;
+       if (pdata->big_endian_desc)
+               ehci->big_endian_desc = 1;
+       if (pdata->big_endian_mmio)
+               ehci->big_endian_mmio = 1;
 
        if (pdata->pre_setup) {
                retval = pdata->pre_setup(hcd);
@@ -142,6 +144,7 @@ static int ehci_platform_probe(struct platform_device *dev)
        struct resource *res_mem;
        struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);
        struct ehci_platform_priv *priv;
+       struct ehci_hcd *ehci;
        int err, irq, clk = 0;
 
        if (usb_disabled())
@@ -177,8 +180,34 @@ static int ehci_platform_probe(struct platform_device *dev)
        platform_set_drvdata(dev, hcd);
        dev->dev.platform_data = pdata;
        priv = hcd_to_ehci_priv(hcd);
+       ehci = hcd_to_ehci(hcd);
 
        if (pdata == &ehci_platform_defaults && dev->dev.of_node) {
+               if (of_property_read_bool(dev->dev.of_node, "big-endian-regs"))
+                       ehci->big_endian_mmio = 1;
+
+               if (of_property_read_bool(dev->dev.of_node, "big-endian-desc"))
+                       ehci->big_endian_desc = 1;
+
+               if (of_property_read_bool(dev->dev.of_node, "big-endian"))
+                       ehci->big_endian_mmio = ehci->big_endian_desc = 1;
+
+#ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO
+               if (ehci->big_endian_mmio) {
+                       dev_err(&dev->dev,
+                               "Error big-endian-regs not compiled in\n");
+                       err = -EINVAL;
+                       goto err_put_hcd;
+               }
+#endif
+#ifndef CONFIG_USB_EHCI_BIG_ENDIAN_DESC
+               if (ehci->big_endian_desc) {
+                       dev_err(&dev->dev,
+                               "Error big-endian-desc not compiled in\n");
+                       err = -EINVAL;
+                       goto err_put_hcd;
+               }
+#endif
                priv->phy = devm_phy_get(&dev->dev, "usb");
                if (IS_ERR(priv->phy)) {
                        err = PTR_ERR(priv->phy);