From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 23 Dec 2011 17:21:52 +0000 (+0000)
Subject: brcm47xx: fix usb on more recent bcma based devices.
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/71a38e2476b245996183ecb422fb1dc1423d7691?ds=sidebyside

brcm47xx: fix usb on more recent bcma based devices.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29605 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/brcm47xx/patches-3.0/0032-USB-Add-driver-for-the-bcma-bus.patch b/target/linux/brcm47xx/patches-3.0/0032-USB-Add-driver-for-the-bcma-bus.patch
index 3a35ac80e..cecc017d0 100644
--- a/target/linux/brcm47xx/patches-3.0/0032-USB-Add-driver-for-the-bcma-bus.patch
+++ b/target/linux/brcm47xx/patches-3.0/0032-USB-Add-driver-for-the-bcma-bus.patch
@@ -46,7 +46,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +obj-$(CONFIG_USB_HCD_BCMA)	+= bcma-hcd.o
 --- /dev/null
 +++ b/drivers/usb/host/bcma-hcd.c
-@@ -0,0 +1,298 @@
+@@ -0,0 +1,299 @@
 +/*
 + * Broadcom specific Advanced Microcontroller Bus
 + * Broadcom USB-core driver (BCMA bus glue)
@@ -106,7 +106,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +			tmp = bcma_read32(dev, 0x1e0);
 +			tmp |= 0x100;
 +			bcma_write32(dev, 0x1e0, tmp);
-+			if (bcma_wait_bits(dev, 0x1e0, 1 << 24, 100, 0))
++			if (bcma_wait_bits(dev, 0x1e0, 1 << 24, 100, 1))
 +				printk(KERN_EMERG "Failed to enable misc PPL!\n");
 +
 +			/* Take out of resets */
@@ -132,10 +132,11 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 +			udelay(50);
 +			tmp = bcma_read32(dev, 0x524);
 +
-+			if (bcma_wait_bits(dev, 0x528, 0xc000, 10000, 1))
++			if (bcma_wait_bits(dev, 0x528, 0xc000, 10000, 1)) {
++				tmp = bcma_read32(dev, 0x528);
 +				printk(KERN_EMERG
 +				       "USB20H mdio_rddata 0x%08x\n", tmp);
-+
++			}
 +			bcma_write32(dev, 0x528, 0x80000000);
 +			tmp = bcma_read32(dev, 0x314);
 +			udelay(265);