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
This commit is contained in:
parent
63bc66cfcd
commit
64d3e52ad0
1 changed files with 22 additions and 9 deletions
|
@ -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>
|
||||
Date: Tue, 16 Jun 2015 17:14:26 +0200
|
||||
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>
|
||||
---
|
||||
drivers/usb/host/bcma-hcd.c | 218 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 218 insertions(+)
|
||||
drivers/usb/host/bcma-hcd.c | 219 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 219 insertions(+)
|
||||
|
||||
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
|
||||
+++ b/drivers/usb/host/bcma-hcd.c
|
||||
@@ -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.
|
||||
@@ -343,6 +344,217 @@ err_unregister_ohci_dev:
|
||||
@@ -343,6 +344,215 @@ err_unregister_ohci_dev:
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@ -215,8 +215,6 @@ index 0b4d0e8..71fa06d 100644
|
|||
+
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ pr_info("[%s:%d] DONE\n", __FUNCTION__, __LINE__);
|
||||
+out:
|
||||
+ if (dmu)
|
||||
+ iounmap(dmu);
|
||||
|
@ -241,7 +239,7 @@ index 0b4d0e8..71fa06d 100644
|
|||
static int bcma_hcd_probe(struct bcma_device *dev)
|
||||
{
|
||||
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)
|
||||
return err;
|
||||
break;
|
||||
|
@ -253,7 +251,22 @@ index 0b4d0e8..71fa06d 100644
|
|||
default:
|
||||
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[] = {
|
||||
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),
|
||||
|
|
Loading…
Reference in a new issue