diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-19 20:07:24 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-19 20:07:24 +0000 |
commit | 0799e77a8b44009bb6fc34a314bcbf8c970ad47a (patch) | |
tree | 7b30087889876498529dd68e6f69634329a31c2b /target/linux/brcm47xx/patches-2.6.33/250-ohci-ssb-usb2.patch | |
parent | d82495ee60b78b22dcb2d679e8f90ae898adbda3 (diff) | |
download | upstream-0799e77a8b44009bb6fc34a314bcbf8c970ad47a.tar.gz upstream-0799e77a8b44009bb6fc34a314bcbf8c970ad47a.tar.bz2 upstream-0799e77a8b44009bb6fc34a314bcbf8c970ad47a.zip |
brcm47xx: remove kernel 2.6.33
SVN-Revision: 22295
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.33/250-ohci-ssb-usb2.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.33/250-ohci-ssb-usb2.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.33/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.33/250-ohci-ssb-usb2.patch deleted file mode 100644 index 25b27e47e8..0000000000 --- a/target/linux/brcm47xx/patches-2.6.33/250-ohci-ssb-usb2.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- - 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); |