diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-11-01 22:21:49 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-11-01 22:21:49 +0000 |
| commit | c348b3317ae8e59c706cd72fa86a54cdcd3150c5 (patch) | |
| tree | 3e475535c7efb60da6672cad457bf65f90cef58b /target/linux/bcm53xx/patches-4.3/197-USB-bcma-add-USB-3.0-support.patch | |
| parent | 55a912f43e9762638e3b3d0fc640d903f29ba8b7 (diff) | |
| download | upstream-c348b3317ae8e59c706cd72fa86a54cdcd3150c5.tar.gz upstream-c348b3317ae8e59c706cd72fa86a54cdcd3150c5.tar.bz2 upstream-c348b3317ae8e59c706cd72fa86a54cdcd3150c5.zip | |
bcm53xx: replace USB patch fixing power control with the most recent version
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 47336
Diffstat (limited to 'target/linux/bcm53xx/patches-4.3/197-USB-bcma-add-USB-3.0-support.patch')
| -rw-r--r-- | target/linux/bcm53xx/patches-4.3/197-USB-bcma-add-USB-3.0-support.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/bcm53xx/patches-4.3/197-USB-bcma-add-USB-3.0-support.patch b/target/linux/bcm53xx/patches-4.3/197-USB-bcma-add-USB-3.0-support.patch index f477a1b65d..34ab858b4d 100644 --- a/target/linux/bcm53xx/patches-4.3/197-USB-bcma-add-USB-3.0-support.patch +++ b/target/linux/bcm53xx/patches-4.3/197-USB-bcma-add-USB-3.0-support.patch @@ -14,7 +14,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c -@@ -28,6 +28,7 @@ +@@ -29,6 +29,7 @@ #include <linux/of_gpio.h> #include <linux/usb/ehci_pdriver.h> #include <linux/usb/ohci_pdriver.h> @@ -22,15 +22,15 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> MODULE_AUTHOR("Hauke Mehrtens"); MODULE_DESCRIPTION("Common USB driver for BCMA Bus"); -@@ -37,6 +38,7 @@ struct bcma_hcd_device { +@@ -38,6 +39,7 @@ struct bcma_hcd_device { struct bcma_device *core; struct platform_device *ehci_dev; struct platform_device *ohci_dev; + struct platform_device *xhci_dev; + struct gpio_desc *gpio_desc; }; - /* Wait for bitmask in a register to get set or cleared. -@@ -250,6 +252,10 @@ static const struct usb_ehci_pdata ehci_ +@@ -245,6 +247,10 @@ static const struct usb_ehci_pdata ehci_ static const struct usb_ohci_pdata ohci_pdata = { }; @@ -41,7 +41,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, const char *name, u32 addr, const void *data, -@@ -343,6 +349,216 @@ err_unregister_ohci_dev: +@@ -338,6 +344,216 @@ err_unregister_ohci_dev: return err; } @@ -258,7 +258,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> static int bcma_hcd_probe(struct bcma_device *dev) { int err; -@@ -365,6 +581,11 @@ static int bcma_hcd_probe(struct bcma_de +@@ -364,6 +580,11 @@ static int bcma_hcd_probe(struct bcma_de if (err) return err; break; @@ -270,7 +270,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> default: return -ENODEV; } -@@ -378,11 +599,14 @@ static void bcma_hcd_remove(struct bcma_ +@@ -377,11 +598,14 @@ static void bcma_hcd_remove(struct bcma_ 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; @@ -285,7 +285,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> bcma_core_disable(dev, 0); } -@@ -419,6 +643,7 @@ static int bcma_hcd_resume(struct bcma_d +@@ -418,6 +642,7 @@ static int bcma_hcd_resume(struct bcma_d 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), |