From 901a7fa067c63a81eda14becfffa1bbd79009e33 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Tue, 30 Jun 2015 23:26:09 +0000 Subject: kernel: update 3.18 to 3.18.17 Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.17 Signed-off-by: Jonas Gorski SVN-Revision: 46150 --- .../321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch | 7 ------- ...B-bcma-make-helper-creating-platform-dev-more-gene.patch | 13 ++++--------- ...B-bcma-use-separated-function-for-USB-2.0-initiali.patch | 9 ++------- .../patches-3.18/812-USB-bcma-add-USB-3.0-support.patch | 11 +++-------- .../813-USB-bcma-fix-setting-VCC-GPIO-value.patch | 7 +------ .../820-xhci-add-Broadcom-specific-fake-doorbell.patch | 7 +------ 6 files changed, 11 insertions(+), 43 deletions(-) (limited to 'target/linux/bcm53xx') diff --git a/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch b/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch index 9cb92b4ddb..586d7387ab 100644 --- a/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch +++ b/target/linux/bcm53xx/patches-3.18/321-ARM-BCM5301X-Set-vcc-gpio-for-USB-controllers.patch @@ -12,8 +12,6 @@ Signed-off-by: Rafał Miłecki arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 11 +++++++++++ 2 files changed, 31 insertions(+) -diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -index 0b76a07..d0bb118 100644 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts @@ -25,6 +25,26 @@ @@ -43,8 +41,6 @@ index 0b76a07..d0bb118 100644 spi { compatible = "spi-gpio"; num-chipselects = <1>; -diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -index d8ccc70..a05b8c2 100644 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts @@ -25,6 +25,17 @@ @@ -65,6 +61,3 @@ index d8ccc70..a05b8c2 100644 leds { compatible = "gpio-leds"; --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/810-USB-bcma-make-helper-creating-platform-dev-more-gene.patch b/target/linux/bcm53xx/patches-3.18/810-USB-bcma-make-helper-creating-platform-dev-more-gene.patch index a74233bb97..d331ae6573 100644 --- a/target/linux/bcm53xx/patches-3.18/810-USB-bcma-make-helper-creating-platform-dev-more-gene.patch +++ b/target/linux/bcm53xx/patches-3.18/810-USB-bcma-make-helper-creating-platform-dev-more-gene.patch @@ -14,11 +14,9 @@ Signed-off-by: Rafał Miłecki drivers/usb/host/bcma-hcd.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) -diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c -index 5398e3d..d347282 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c -@@ -249,7 +249,10 @@ static const struct usb_ehci_pdata ehci_pdata = { +@@ -249,7 +249,10 @@ static const struct usb_ehci_pdata ehci_ static const struct usb_ohci_pdata ohci_pdata = { }; @@ -30,7 +28,7 @@ index 5398e3d..d347282 100644 { struct platform_device *hci_dev; struct resource hci_res[2]; -@@ -264,8 +267,7 @@ static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, boo +@@ -264,8 +267,7 @@ static struct platform_device *bcma_hcd_ hci_res[1].start = dev->irq; hci_res[1].flags = IORESOURCE_IRQ; @@ -40,7 +38,7 @@ index 5398e3d..d347282 100644 if (!hci_dev) return ERR_PTR(-ENOMEM); -@@ -276,12 +278,8 @@ static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, boo +@@ -276,12 +278,8 @@ static struct platform_device *bcma_hcd_ ARRAY_SIZE(hci_res)); if (ret) goto err_alloc; @@ -55,7 +53,7 @@ index 5398e3d..d347282 100644 if (ret) goto err_alloc; ret = platform_device_add(hci_dev); -@@ -334,11 +332,15 @@ static int bcma_hcd_probe(struct bcma_device *dev) +@@ -334,11 +332,15 @@ static int bcma_hcd_probe(struct bcma_de && chipinfo->rev == 0) ohci_addr = 0x18009000; @@ -73,6 +71,3 @@ index 5398e3d..d347282 100644 if (IS_ERR(usb_dev->ehci_dev)) { err = PTR_ERR(usb_dev->ehci_dev); goto err_unregister_ohci_dev; --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/811-USB-bcma-use-separated-function-for-USB-2.0-initiali.patch b/target/linux/bcm53xx/patches-3.18/811-USB-bcma-use-separated-function-for-USB-2.0-initiali.patch index 873db5e037..758b0ac1eb 100644 --- a/target/linux/bcm53xx/patches-3.18/811-USB-bcma-use-separated-function-for-USB-2.0-initiali.patch +++ b/target/linux/bcm53xx/patches-3.18/811-USB-bcma-use-separated-function-for-USB-2.0-initiali.patch @@ -13,11 +13,9 @@ Signed-off-by: Rafał Miłecki drivers/usb/host/bcma-hcd.c | 51 +++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 16 deletions(-) -diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c -index d347282..0b4d0e8 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c -@@ -34,6 +34,7 @@ MODULE_DESCRIPTION("Common USB driver for BCMA Bus"); +@@ -34,6 +34,7 @@ MODULE_DESCRIPTION("Common USB driver fo MODULE_LICENSE("GPL"); struct bcma_hcd_device { @@ -57,7 +55,7 @@ index d347282..0b4d0e8 100644 switch (dev->id.id) { case BCMA_CORE_NS_USB20: bcma_hcd_init_chip_arm(dev); -@@ -346,7 +336,6 @@ static int bcma_hcd_probe(struct bcma_device *dev) +@@ -346,7 +336,6 @@ static int bcma_hcd_probe(struct bcma_de goto err_unregister_ohci_dev; } @@ -102,6 +100,3 @@ index d347282..0b4d0e8 100644 static void bcma_hcd_remove(struct bcma_device *dev) { struct bcma_hcd_device *usb_dev = bcma_get_drvdata(dev); --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch b/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch index 281675180b..30313e8a28 100644 --- a/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch +++ b/target/linux/bcm53xx/patches-3.18/812-USB-bcma-add-USB-3.0-support.patch @@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki 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..ebcda25 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c @@ -37,6 +37,7 @@ struct bcma_hcd_device { @@ -239,7 +237,7 @@ index 0b4d0e8..ebcda25 100644 static int bcma_hcd_probe(struct bcma_device *dev) { int err; -@@ -365,6 +575,11 @@ static int bcma_hcd_probe(struct bcma_device *dev) +@@ -365,6 +575,11 @@ static int bcma_hcd_probe(struct bcma_de if (err) return err; break; @@ -251,7 +249,7 @@ index 0b4d0e8..ebcda25 100644 default: return -ENODEV; } -@@ -378,11 +593,14 @@ static void bcma_hcd_remove(struct bcma_device *dev) +@@ -378,11 +593,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; @@ -266,7 +264,7 @@ index 0b4d0e8..ebcda25 100644 bcma_core_disable(dev, 0); } -@@ -419,6 +637,7 @@ static int bcma_hcd_resume(struct bcma_device *dev) +@@ -419,6 +637,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), @@ -274,6 +272,3 @@ index 0b4d0e8..ebcda25 100644 BCMA_CORETABLE_END }; MODULE_DEVICE_TABLE(bcma, bcma_hcd_table); --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/813-USB-bcma-fix-setting-VCC-GPIO-value.patch b/target/linux/bcm53xx/patches-3.18/813-USB-bcma-fix-setting-VCC-GPIO-value.patch index 71777816da..9ba3bdeece 100644 --- a/target/linux/bcm53xx/patches-3.18/813-USB-bcma-fix-setting-VCC-GPIO-value.patch +++ b/target/linux/bcm53xx/patches-3.18/813-USB-bcma-fix-setting-VCC-GPIO-value.patch @@ -14,11 +14,9 @@ Signed-off-by: Rafał Miłecki drivers/usb/host/bcma-hcd.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c -index 8853ef7..d18ffdc 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c -@@ -230,17 +230,22 @@ static void bcma_hcd_init_chip_arm(struct bcma_device *dev) +@@ -230,17 +230,22 @@ static void bcma_hcd_init_chip_arm(struc static void bcma_hci_platform_power_gpio(struct bcma_device *dev, bool val) { @@ -45,6 +43,3 @@ index 8853ef7..d18ffdc 100644 gpio_free(gpio); } } --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch b/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch index 87d23c3a51..d459520d3f 100644 --- a/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-3.18/820-xhci-add-Broadcom-specific-fake-doorbell.patch @@ -14,8 +14,6 @@ Signed-off-by: Rafał Miłecki drivers/usb/host/xhci.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) -diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index 3bceabe..0737ab2 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -122,6 +122,64 @@ int xhci_halt(struct xhci_hcd *xhci) @@ -83,7 +81,7 @@ index 3bceabe..0737ab2 100644 /* * Set the run bit and wait for the host to be running. */ -@@ -146,6 +204,10 @@ static int xhci_start(struct xhci_hcd *xhci) +@@ -146,6 +204,10 @@ static int xhci_start(struct xhci_hcd *x xhci_err(xhci, "Host took too long to start, " "waited %u microseconds.\n", XHCI_MAX_HALT_USEC); @@ -94,6 +92,3 @@ index 3bceabe..0737ab2 100644 if (!ret) xhci->xhc_state &= ~XHCI_STATE_HALTED; return ret; --- -1.8.4.5 - -- cgit v1.2.3