[PATCH] USB: OHCI on Compaq Aramada 7400

This adds a quirk to the OHCI driver that lets it work with an old
Compaq implementation.  It also removes some needless strings from
the non-debug version of the driver.

Signed-off-by: Chris Clayton <chris_clayton@f1internet.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 11 insertions, 2 deletions

diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index c90114a7727..e372306ed0d 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -1021,6 +1021,8 @@ rescan_this:
 
                 if (ohci->ed_controltail) {
                         command |= OHCI_CLF;
+                        if (ohci->flags & OHCI_QUIRK_ZFMICRO)
+                                mdelay(1);
                         if (!(ohci->hc_control & OHCI_CTRL_CLE)) {
                                 control |= OHCI_CTRL_CLE;
                                 ohci_writel (ohci, 0,
@@ -1029,6 +1031,8 @@ rescan_this:
                 }
                 if (ohci->ed_bulktail) {
                         command |= OHCI_BLF;
+                        if (ohci->flags & OHCI_QUIRK_ZFMICRO)
+                                mdelay(1);
                         if (!(ohci->hc_control & OHCI_CTRL_BLE)) {
                                 control |= OHCI_CTRL_BLE;
                                 ohci_writel (ohci, 0,
@@ -1039,12 +1043,17 @@ rescan_this:
                 /* CLE/BLE to enable, CLF/BLF to (maybe) kickstart */
                 if (control) {
                         ohci->hc_control |= control;
+                        if (ohci->flags & OHCI_QUIRK_ZFMICRO)
+                                mdelay(1);
                         ohci_writel (ohci, ohci->hc_control,
                                         &ohci->regs->control);   
                 }
-                if (command)
+                if (command) {
+                        if (ohci->flags & OHCI_QUIRK_ZFMICRO)
+                                mdelay(1);
                         ohci_writel (ohci, command, &ohci->regs->cmdstatus);   
-        }
+                }
+        }
 }