[PATCH] Au1200 OHCI/EHCI fixes

[Manuel Lauss <mano@roarinelk.homelinux.net>]

Hello,

This little patch fixes compileproblems in Au1000
OHCI/EHCI code. Run-tested on custom Au1200 Platform.

Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>


diff -Naurp linux-2.6.17.7-base/drivers/usb/host/ehci-au1xxx.c 
linux-2.6.17.7-work/drivers/usb/host/ehci-au1xxx.c
--- linux-2.6.17.7-base/drivers/usb/host/ehci-au1xxx.c  2006-08-02 
08:12:42.378136000 +0200
+++ linux-2.6.17.7-work/drivers/usb/host/ehci-au1xxx.c  2006-08-09 
13:57:54.576811000 +0200
@@ -111,9 +111,9 @@ int usb_ehci_au1xxx_probe(const struct h
 
        /* Au1200 AB USB does not support coherent memory */
        if (!(read_c0_prid() & 0xff)) {
-               pr_info("%s: this is chip revision AB!\n", dev->dev.name);
+               pr_info("%s: this is chip revision AB!\n", 
dev->dev.driver->name);
                pr_info("%s: update your board or re-configure the kernel\n",
-                       dev->dev.name);
+                       dev->dev.driver->name);
                return -ENODEV;
        }
 #endif
diff -Naurp linux-2.6.17.7-base/drivers/usb/host/ohci-au1xxx.c 
linux-2.6.17.7-work/drivers/usb/host/ohci-au1xxx.c
--- linux-2.6.17.7-base/drivers/usb/host/ohci-au1xxx.c  2006-08-02 
08:12:42.398136000 +0200
+++ linux-2.6.17.7-work/drivers/usb/host/ohci-au1xxx.c  2006-08-10 
08:46:56.430581000 +0200
@@ -84,6 +84,11 @@ static void au1xxx_start_ohc(struct plat
        au_writel(USBH_ENABLE_INIT, USB_HOST_CONFIG);
        udelay(1000);
 
+       /* wait for reset complete (read register twice; see au1500 errata) */
+       while (au_readl(USB_HOST_CONFIG),
+               !(au_readl(USB_HOST_CONFIG) & USBH_ENABLE_RD))
+               udelay(1000);
+
 #else   /* Au1200 */
 
        /* write HW defaults again in case Yamon cleared them */
@@ -101,11 +106,6 @@ static void au1xxx_start_ohc(struct plat
 
 #endif  /* Au1200 */
 
-       /* wait for reset complete (read register twice; see au1500 errata) */
-       while (au_readl(USB_HOST_CONFIG),
-               !(au_readl(USB_HOST_CONFIG) & USBH_ENABLE_RD))
-               udelay(1000);
-
        printk(KERN_DEBUG __FILE__
        ": Clock to USB host has been enabled \n");
 }
@@ -157,9 +157,9 @@ static int usb_ohci_au1xxx_probe(const s
        /* Au1200 AB USB does not support coherent memory */
        if (!(read_c0_prid() & 0xff)) {
                pr_info("%s: this is chip revision AB !!\n",
-                       dev->dev.name);
+                       dev->dev.driver->name);
                pr_info("%s: update your board or re-configure the kernel\n",
-                       dev->dev.name);
+                       dev->dev.driver->name);
                return -ENODEV;
        }
 #endif