brcm47xx: fix usb on more recent bcma based devices.

SVN-Revision: 29605
This commit is contained in:
Hauke Mehrtens 2011-12-23 17:21:52 +00:00
parent 7b1e525b56
commit 11125d68ed

View file

@ -46,7 +46,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+obj-$(CONFIG_USB_HCD_BCMA) += bcma-hcd.o +obj-$(CONFIG_USB_HCD_BCMA) += bcma-hcd.o
--- /dev/null --- /dev/null
+++ b/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c
@@ -0,0 +1,298 @@ @@ -0,0 +1,299 @@
+/* +/*
+ * Broadcom specific Advanced Microcontroller Bus + * Broadcom specific Advanced Microcontroller Bus
+ * Broadcom USB-core driver (BCMA bus glue) + * 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 = bcma_read32(dev, 0x1e0);
+ tmp |= 0x100; + tmp |= 0x100;
+ bcma_write32(dev, 0x1e0, tmp); + 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"); + printk(KERN_EMERG "Failed to enable misc PPL!\n");
+ +
+ /* Take out of resets */ + /* Take out of resets */
@ -132,10 +132,11 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ udelay(50); + udelay(50);
+ tmp = bcma_read32(dev, 0x524); + 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 + printk(KERN_EMERG
+ "USB20H mdio_rddata 0x%08x\n", tmp); + "USB20H mdio_rddata 0x%08x\n", tmp);
+ + }
+ bcma_write32(dev, 0x528, 0x80000000); + bcma_write32(dev, 0x528, 0x80000000);
+ tmp = bcma_read32(dev, 0x314); + tmp = bcma_read32(dev, 0x314);
+ udelay(265); + udelay(265);