From: Markus Klotzbücher <mk@denx.de>
Date: Wed, 23 Apr 2008 08:57:33 +0000 (+0200)
Subject: USB: remove a cpu bug workaround for an unsupported architecture.
X-Git-Tag: v1.3.3-rc1~38
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=83fe32334337def160b302aa9d152d808bfcc68e;p=oweals%2Fu-boot.git

USB: remove a cpu bug workaround for an unsupported architecture.

Signed-off-by: Markus Klotzbuecher <mk@denx.de>
---

diff --git a/drivers/usb/usb_ohci.c b/drivers/usb/usb_ohci.c
index d37a037ac2..ee0f2e45b1 100644
--- a/drivers/usb/usb_ohci.c
+++ b/drivers/usb/usb_ohci.c
@@ -138,28 +138,14 @@ int got_rhsc;
 /* device which was disconnected */
 struct usb_device *devgone;
 
-/*-------------------------------------------------------------------------*/
-
-/* AMD-756 (D2 rev) reports corrupt register contents in some cases.
- * The erratum (#4) description is incorrect.  AMD's workaround waits
- * till some bits (mostly reserved) are clear; ok for all revs.
- */
-#define OHCI_QUIRK_AMD756 0xabcd
-#define read_roothub(hc, register, mask) ({ \
-	u32 temp = readl (&hc->regs->roothub.register); \
-	if (hc->flags & OHCI_QUIRK_AMD756) \
-		while (temp & mask) \
-			temp = readl (&hc->regs->roothub.register); \
-	temp; })
-
-static u32 roothub_a (struct ohci *hc)
-	{ return read_roothub (hc, a, 0xfc0fe000); }
+static inline u32 roothub_a (struct ohci *hc)
+	{ return readl (&hc->regs->roothub.a); }
 static inline u32 roothub_b (struct ohci *hc)
 	{ return readl (&hc->regs->roothub.b); }
 static inline u32 roothub_status (struct ohci *hc)
 	{ return readl (&hc->regs->roothub.status); }
-static u32 roothub_portstatus (struct ohci *hc, int i)
-	{ return read_roothub (hc, portstatus [i], 0xffe0fce0); }
+static inline u32 roothub_portstatus (struct ohci *hc, int i)
+	{ return readl (&hc->regs->roothub.portstatus[i]); }
 
 /* forward declaration */
 static int hc_interrupt (void);