Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / host / ohci-ppc-of.c

diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 08e237c7bc435bfeca3a33ff35b4a0467de602d4..a6725279122315bf7566b255164d29c7f8130bbd 100644 (file)
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -97,8 +97,8 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
                return -ENODEV;
 
        is_bigendian =
-               device_is_compatible(dn, "ohci-bigendian") ||
-               device_is_compatible(dn, "ohci-be");
+               of_device_is_compatible(dn, "ohci-bigendian") ||
+               of_device_is_compatible(dn, "ohci-be");
 
        dev_dbg(&op->dev, "initializing PPC-OF USB Controller\n");
 
@@ -134,12 +134,17 @@ ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
        }
 
        ohci = hcd_to_ohci(hcd);
-       if (is_bigendian)
+       if (is_bigendian) {
                ohci->flags |= OHCI_QUIRK_BE_MMIO | OHCI_QUIRK_BE_DESC;
+               if (of_device_is_compatible(dn, "fsl,mpc5200-ohci"))
+                       ohci->flags |= OHCI_QUIRK_FRAME_NO;
+               if (of_device_is_compatible(dn, "mpc5200-ohci"))
+                       ohci->flags |= OHCI_QUIRK_FRAME_NO;
+       }
 
        ohci_hcd_init(ohci);
 
-       rv = usb_add_hcd(hcd, irq, 0);
+       rv = usb_add_hcd(hcd, irq, IRQF_DISABLED);
        if (rv == 0)
                return 0;