hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bcm53xx: update xHCI patch 

This drops some debugging pr_info and adds platform_device_unregister.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 46082
owl
Rafał Miłecki 2015-06-21 11:09:30 +00:00
parent 63bc66cfcd
commit 64d3e52ad0
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch
View File

@ -1,4 +1,4 @@
From 78008c94c253963454a9f6d3d2e0324acef3f20a Mon Sep 17 00:00:00 2001 From 12c6932caa6b1fce44d0f0c68ec77d4c00ac0be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Tue, 16 Jun 2015 17:14:26 +0200 Date: Tue, 16 Jun 2015 17:14:26 +0200
Subject: [PATCH] USB: bcma: add USB 3.0 support Subject: [PATCH] USB: bcma: add USB 3.0 support
@ -8,11 +8,11 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- ---
drivers/usb/host/bcma-hcd.c | 218 ++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/host/bcma-hcd.c | 219 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 218 insertions(+) 1 file changed, 219 insertions(+)
diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
index 0b4d0e8..71fa06d 100644 index 0b4d0e8..ebcda25 100644
--- a/drivers/usb/host/bcma-hcd.c --- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c
@@ -37,6 +37,7 @@ struct bcma_hcd_device { @@ -37,6 +37,7 @@ struct bcma_hcd_device {
@ -23,7 +23,7 @@ index 0b4d0e8..71fa06d 100644
}; };
/* Wait for bitmask in a register to get set or cleared. /* Wait for bitmask in a register to get set or cleared.
@@ -343,6 +344,217 @@ err_unregister_ohci_dev: @@ -343,6 +344,215 @@ err_unregister_ohci_dev:
return err; return err;
} }
@ -215,8 +215,6 @@ index 0b4d0e8..71fa06d 100644
+ +
+ break; + break;
+ } + }
+
+ pr_info("[%s:%d] DONE\n", __FUNCTION__, __LINE__);
+out: +out:
+ if (dmu) + if (dmu)
+ iounmap(dmu); + iounmap(dmu);
@ -241,7 +239,7 @@ index 0b4d0e8..71fa06d 100644
static int bcma_hcd_probe(struct bcma_device *dev) static int bcma_hcd_probe(struct bcma_device *dev)
{ {
int err; int err;
@@ -365,6 +577,11 @@ static int bcma_hcd_probe(struct bcma_device *dev) @@ -365,6 +575,11 @@ static int bcma_hcd_probe(struct bcma_device *dev)
if (err) if (err)
return err; return err;
break; break;
@ -253,7 +251,22 @@ index 0b4d0e8..71fa06d 100644
default: default:
return -ENODEV; return -ENODEV;
} }
@@ -419,6 +636,7 @@ static int bcma_hcd_resume(struct bcma_device *dev) @@ -378,11 +593,14 @@ static void bcma_hcd_remove(struct bcma_device *dev)
struct bcma_hcd_device *usb_dev = bcma_get_drvdata(dev);
struct platform_device *ohci_dev = usb_dev->ohci_dev;
struct platform_device *ehci_dev = usb_dev->ehci_dev;
+ struct platform_device *xhci_dev = usb_dev->xhci_dev;
if (ohci_dev)
platform_device_unregister(ohci_dev);
if (ehci_dev)
platform_device_unregister(ehci_dev);
+ if (xhci_dev)
+ platform_device_unregister(xhci_dev);
bcma_core_disable(dev, 0);
}
@@ -419,6 +637,7 @@ static int bcma_hcd_resume(struct bcma_device *dev)
static const struct bcma_device_id bcma_hcd_table[] = { static const struct bcma_device_id bcma_hcd_table[] = {
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_USB20_HOST, BCMA_ANY_REV, BCMA_ANY_CLASS), BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_USB20_HOST, BCMA_ANY_REV, BCMA_ANY_CLASS),
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_NS_USB20, BCMA_ANY_REV, BCMA_ANY_CLASS), BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_NS_USB20, BCMA_ANY_REV, BCMA_ANY_CLASS),