summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-2.6.32/250-ohci-ssb-usb2.patch
diff options
context:
space:
mode:
authormb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-07 16:06:05 +0000
committermb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-07 16:06:05 +0000
commit2e7da1b948f9bf1946f992e7bafe27b913798367 (patch)
tree3834515bb4783f3c43bd1fe9852ec8fab7c5dfac /target/linux/brcm47xx/patches-2.6.32/250-ohci-ssb-usb2.patch
parent936485f730801be1d724f5a011e11f6f4bc75d11 (diff)
bcm47xx: Add basic 2.6.32 support.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19062 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.32/250-ohci-ssb-usb2.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.32/250-ohci-ssb-usb2.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.32/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.32/250-ohci-ssb-usb2.patch
new file mode 100644
index 0000000000..25b27e47e8
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.32/250-ohci-ssb-usb2.patch
@@ -0,0 +1,60 @@
+---
+ drivers/usb/host/ohci-ssb.c | 39 ++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 36 insertions(+), 3 deletions(-)
+
+--- a/drivers/usb/host/ohci-ssb.c
++++ b/drivers/usb/host/ohci-ssb.c
+@@ -106,10 +106,42 @@ static int ssb_ohci_attach(struct ssb_de
+ int err = -ENOMEM;
+ u32 tmp, flags = 0;
+
+- if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV)
++ if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV) {
++ /* Put the device into host-mode. */
+ flags |= SSB_OHCI_TMSLOW_HOSTMODE;
+-
+- ssb_device_enable(dev, flags);
++ ssb_device_enable(dev, flags);
++ } else if (dev->id.coreid == SSB_DEV_USB20_HOST) {
++ /*
++ * USB 2.0 special considerations:
++ *
++ * 1. Since the core supports both OHCI and EHCI functions, it must
++ * only be reset once.
++ *
++ * 2. In addition to the standard SSB reset sequence, the Host Control
++ * Register must be programmed to bring the USB core and various
++ * phy components out of reset.
++ */
++ ssb_device_enable(dev, 0);
++ ssb_write32(dev, 0x200, 0x7ff);
++ udelay(1);
++ if (dev->id.revision == 1) { // bug in rev 1
++
++ /* Change Flush control reg */
++ tmp = ssb_read32(dev, 0x400);
++ tmp &= ~8;
++ ssb_write32(dev, 0x400, tmp);
++ tmp = ssb_read32(dev, 0x400);
++ printk("USB20H fcr: 0x%0x\n", tmp);
++
++ /* Change Shim control reg */
++ tmp = ssb_read32(dev, 0x304);
++ tmp &= ~0x100;
++ ssb_write32(dev, 0x304, tmp);
++ tmp = ssb_read32(dev, 0x304);
++ printk("USB20H shim: 0x%0x\n", tmp);
++ }
++ } else
++ ssb_device_enable(dev, 0);
+
+ hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
+ dev_name(dev->dev));
+@@ -200,6 +232,7 @@ static int ssb_ohci_resume(struct ssb_de
+ static const struct ssb_device_id ssb_ohci_table[] = {
+ SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
+ SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),
++ SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
+ SSB_DEVTABLE_END
+ };
+ MODULE_DEVICE_TABLE(ssb, ssb_ohci_table);