From 9d1da6b4dc70f963433e871ff5027be97c4ca080 Mon Sep 17 00:00:00 2001 From: mb Date: Sun, 6 Sep 2009 20:25:11 +0000 Subject: bcm47xx: Port usb fixes to .30 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17533 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../brcm47xx/patches-2.6.30/270-ehci-ssb.patch | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch') diff --git a/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch index 02e44ca5f..e64dc4b1b 100644 --- a/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch +++ b/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch @@ -1,5 +1,12 @@ ---- a/drivers/usb/host/Kconfig -+++ b/drivers/usb/host/Kconfig +--- + drivers/usb/host/Kconfig | 13 ++ + drivers/usb/host/ehci-hcd.c | 12 ++ + drivers/usb/host/ehci-ssb.c | 201 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/usb/host/ohci-ssb.c | 23 +++++ + 4 files changed, 247 insertions(+), 2 deletions(-) + +--- linux-2.6.30.5.orig/drivers/usb/host/Kconfig ++++ linux-2.6.30.5/drivers/usb/host/Kconfig @@ -106,6 +106,19 @@ config USB_OXU210HP_HCD To compile this driver as a module, choose M here: the module will be called oxu210hp-hcd. @@ -20,8 +27,8 @@ config USB_ISP116X_HCD tristate "ISP116X HCD support" depends on USB ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c +--- linux-2.6.30.5.orig/drivers/usb/host/ehci-hcd.c ++++ linux-2.6.30.5/drivers/usb/host/ehci-hcd.c @@ -1072,8 +1072,16 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ixp4xx_ehci_driver #endif @@ -42,7 +49,7 @@ #endif --- /dev/null -+++ b/drivers/usb/host/ehci-ssb.c ++++ linux-2.6.30.5/drivers/usb/host/ehci-ssb.c @@ -0,0 +1,201 @@ +/* + * Sonics Silicon Backplane @@ -207,7 +214,7 @@ + u32 tmp, flags = 0; + + hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev, -+ dev_name(dev->dev)); ++ dev->dev->bus_id); + if (!hcd) + goto err_dev_disable; + @@ -245,8 +252,8 @@ + SSB_DEVTABLE_END +}; +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table); ---- a/drivers/usb/host/ohci-ssb.c -+++ b/drivers/usb/host/ohci-ssb.c +--- linux-2.6.30.5.orig/drivers/usb/host/ohci-ssb.c ++++ linux-2.6.30.5/drivers/usb/host/ohci-ssb.c @@ -17,6 +17,8 @@ */ #include @@ -290,7 +297,7 @@ static int ssb_ohci_attach(struct ssb_device *dev) { struct ssb_ohci_device *ohcidev; -@@ -184,6 +199,14 @@ static int ssb_ohci_attach(struct ssb_de +@@ -165,6 +180,14 @@ static int ssb_ohci_attach(struct ssb_de ssb_set_drvdata(dev, hcd); -- cgit v1.2.3