X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm47xx%2Fpatches-2.6.28%2F250-ohci-ssb-usb2.patch;h=065a16b3866f983d63c6a0226e1942bf52b990ce;hb=4f182a1a9865c471cfab54efbc4464466379e1a9;hp=a3d0481b46b879c128a46479a67e2c495804e8f8;hpb=3b617e51ccb4e6e8fd00cbf15bf76a218776d6dd;p=openwrt-10.03%2F.git

diff --git a/target/linux/brcm47xx/patches-2.6.28/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.28/250-ohci-ssb-usb2.patch
index a3d0481b4..065a16b38 100644
--- a/target/linux/brcm47xx/patches-2.6.28/250-ohci-ssb-usb2.patch
+++ b/target/linux/brcm47xx/patches-2.6.28/250-ohci-ssb-usb2.patch
@@ -1,41 +1,31 @@
-diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
-@@ -106,10 +106,59 @@ static int ssb_ohci_attach(struct ssb_device *dev)
+---
+ drivers/usb/host/ohci-ssb.c |   39 ++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 36 insertions(+), 3 deletions(-)
+
+--- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c
++++ linux-2.6.28.10/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)
-+	/*
-+	 * THE FOLLOWING COMMENTS PRESERVED FROM GPL SOURCE RELEASE
-+	 *
-+	 * The USB core requires a special bit to be set during core
-+	 * reset to enable host (OHCI) mode. Resetting the SB core in
-+	 * pcibios_enable_device() is a hack for compatibility with
-+	 * vanilla usb-ohci so that it does not have to know about
-+	 * SB. A driver that wants to use the USB core in device mode
-+	 * should know about SB and should reset the bit back to 0
-+	 * after calling pcibios_enable_device().
-+	 */
-+
 +	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);
-+	}
-+
-+	/*
-+	 * 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 SB reset sequence, the Host Control
-+	 *    Register must be programmed to bring the USB core and various
-+	 *    phy components out of reset. 
-+	 */
-+
-+	else if (dev->id.coreid == SSB_DEV_USB20_HOST) {
-+#warning FIX ME need test for core being up & exit
++	} 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);
@@ -55,15 +45,12 @@ diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
 +			tmp = ssb_read32(dev, 0x304);
 +			printk("USB20H shim: 0x%0x\n", tmp);
 +		}
-+	}
-+	else
++	} else
 +		ssb_device_enable(dev, 0);
  
--	ssb_device_enable(dev, flags);
- 
  	hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
  			dev_name(dev->dev));
-@@ -200,6 +249,7 @@ static int ssb_ohci_resume(struct ssb_device *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),