diff options
Diffstat (limited to 'target/linux/bcm53xx')
12 files changed, 15 insertions, 105 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/063-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch b/target/linux/bcm53xx/patches-3.18/063-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch index e41d8b853c..8716a0d5c6 100644 --- a/target/linux/bcm53xx/patches-3.18/063-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch +++ b/target/linux/bcm53xx/patches-3.18/063-ARM-BCM5301X-Ignore-another-BCM4709-specific-fault-c.patch @@ -16,8 +16,6 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> arch/arm/mach-bcm/bcm_5301x.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c -index e9bcbdb..7aef927 100644 --- a/arch/arm/mach-bcm/bcm_5301x.c +++ b/arch/arm/mach-bcm/bcm_5301x.c @@ -18,15 +18,16 @@ static bool first_fault = true; @@ -41,6 +39,3 @@ index e9bcbdb..7aef927 100644 /* Returning non-zero causes fault display and panic */ return 0; --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/064-ARM-BCM5301X-add-NAND-flash-chip-description.patch b/target/linux/bcm53xx/patches-3.18/064-ARM-BCM5301X-add-NAND-flash-chip-description.patch index 04527412a0..aa99f3758c 100644 --- a/target/linux/bcm53xx/patches-3.18/064-ARM-BCM5301X-add-NAND-flash-chip-description.patch +++ b/target/linux/bcm53xx/patches-3.18/064-ARM-BCM5301X-add-NAND-flash-chip-description.patch @@ -27,8 +27,6 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 14 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi -diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts -index 71cff8d..112a5a8 100644 --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts @@ -10,6 +10,7 @@ @@ -39,8 +37,6 @@ index 71cff8d..112a5a8 100644 / { compatible = "asus,rt-ac56u", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts -index 8b62836..3600f56 100644 --- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts +++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts @@ -10,6 +10,7 @@ @@ -51,8 +47,6 @@ index 8b62836..3600f56 100644 / { compatible = "asus,rt-ac68u", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts -index 78e95c0..24f0ab5 100644 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts @@ -10,6 +10,7 @@ @@ -63,8 +57,6 @@ index 78e95c0..24f0ab5 100644 / { compatible = "buffalo,wzr-1750dhp", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -index 946c728..f039393 100644 --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts @@ -10,6 +10,7 @@ @@ -90,8 +82,6 @@ index 946c728..f039393 100644 partition@0 { label = "ubi"; reg = <0x00000000 0x08000000>; -diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts -index 2ed9e57..326ce8f 100644 --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts @@ -10,6 +10,7 @@ @@ -102,8 +92,6 @@ index 2ed9e57..326ce8f 100644 / { compatible = "netgear,r6250v1", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts -index 3991042..3a94606 100644 --- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts @@ -10,6 +10,7 @@ @@ -114,8 +102,6 @@ index 3991042..3a94606 100644 / { compatible = "netgear,r6300v2", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts -index 66dfb53..d6a033b 100644 --- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts @@ -10,6 +10,7 @@ @@ -126,8 +112,6 @@ index 66dfb53..d6a033b 100644 / { compatible = "smartrg,sr400ac", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts -index 0ee85ea..71b98cf 100644 --- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts @@ -10,6 +10,7 @@ @@ -138,8 +122,6 @@ index 0ee85ea..71b98cf 100644 / { compatible = "asus,rt-n18u", "brcm,bcm47081", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts -index db9131e..bb0cb0b 100644 --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts @@ -10,6 +10,7 @@ @@ -150,8 +132,6 @@ index db9131e..bb0cb0b 100644 / { compatible = "buffalo,wzr-600dhp2", "brcm,bcm47081", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts -index 7d6868a..184fd92 100644 --- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts @@ -10,6 +10,7 @@ @@ -162,8 +142,6 @@ index 7d6868a..184fd92 100644 / { compatible = "buffalo,wzr-900dhp", "brcm,bcm47081", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts -index 548e93b..2a92e8d 100644 --- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts +++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts @@ -10,6 +10,7 @@ @@ -174,8 +152,6 @@ index 548e93b..2a92e8d 100644 / { compatible = "buffalo,wxr-1900dhp", "brcm,bcm4709", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts -index ea26dd3..446c586 100644 --- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts +++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts @@ -10,6 +10,7 @@ @@ -186,9 +162,6 @@ index ea26dd3..446c586 100644 / { compatible = "netgear,r8000", "brcm,bcm4709", "brcm,bcm4708"; -diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi -new file mode 100644 -index 0000000..d10781e --- /dev/null +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi @@ -0,0 +1,24 @@ @@ -216,8 +189,6 @@ index 0000000..d10781e + }; + }; +}; -diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi -index 78aec62..a97f631 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -143,4 +143,16 @@ @@ -237,6 +208,3 @@ index 78aec62..a97f631 100644 + brcm,nand-has-wp; + }; }; --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/065-ARM-BCM5301X-add-IRQ-numbers-for-PCIe-controller.patch b/target/linux/bcm53xx/patches-3.18/065-ARM-BCM5301X-add-IRQ-numbers-for-PCIe-controller.patch index fe3a0ceb07..142211520e 100644 --- a/target/linux/bcm53xx/patches-3.18/065-ARM-BCM5301X-add-IRQ-numbers-for-PCIe-controller.patch +++ b/target/linux/bcm53xx/patches-3.18/065-ARM-BCM5301X-add-IRQ-numbers-for-PCIe-controller.patch @@ -13,8 +13,6 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> arch/arm/boot/dts/bcm5301x.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi -index a97f631..21fefd4 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -108,6 +108,30 @@ @@ -48,6 +46,3 @@ index a97f631..21fefd4 100644 /* USB 2.0 Controller */ <0x00021000 0 &gic GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>, --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/066-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch b/target/linux/bcm53xx/patches-3.18/066-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch index 68bf3c67b1..463e42df56 100644 --- a/target/linux/bcm53xx/patches-3.18/066-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch +++ b/target/linux/bcm53xx/patches-3.18/066-ARM-BCM5301X-Add-DT-for-Asus-RT-AC87U.patch @@ -15,8 +15,6 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 2 files changed, 66 insertions(+) create mode 100644 arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 4802376..4e76f68 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -65,6 +65,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ @@ -27,9 +25,6 @@ index 4802376..4e76f68 100644 bcm4709-buffalo-wxr-1900dhp.dtb \ bcm4709-netgear-r8000.dtb dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb -diff --git a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts -new file mode 100644 -index 0000000..aedf3c4 --- /dev/null +++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts @@ -0,0 +1,65 @@ @@ -98,6 +93,3 @@ index 0000000..aedf3c4 + }; + }; +}; --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/180-USB-bcma-remove-chip-id-check.patch b/target/linux/bcm53xx/patches-3.18/180-USB-bcma-remove-chip-id-check.patch index 56e962d793..e5e3010356 100644 --- a/target/linux/bcm53xx/patches-3.18/180-USB-bcma-remove-chip-id-check.patch +++ b/target/linux/bcm53xx/patches-3.18/180-USB-bcma-remove-chip-id-check.patch @@ -13,8 +13,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> drivers/usb/host/bcma-hcd.c | 5 ----- 1 file changed, 5 deletions(-) -diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c -index cd6d0af..080587e 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c @@ -214,16 +214,11 @@ err_alloc: @@ -34,6 +32,3 @@ index cd6d0af..080587e 100644 /* TODO: Probably need checks here; is the core connected? */ --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/181-USB-bcma-replace-numbers-with-constants.patch b/target/linux/bcm53xx/patches-3.18/181-USB-bcma-replace-numbers-with-constants.patch index 1e18fcfca2..5ae4e0d7aa 100644 --- a/target/linux/bcm53xx/patches-3.18/181-USB-bcma-replace-numbers-with-constants.patch +++ b/target/linux/bcm53xx/patches-3.18/181-USB-bcma-replace-numbers-with-constants.patch @@ -10,11 +10,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> drivers/usb/host/bcma-hcd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c -index 080587e..853bf9d 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c -@@ -233,7 +233,8 @@ static int bcma_hcd_probe(struct bcma_device *dev) +@@ -233,7 +233,8 @@ static int bcma_hcd_probe(struct bcma_de /* In AI chips EHCI is addrspace 0, OHCI is 1 */ ohci_addr = dev->addr_s[0]; @@ -24,6 +22,3 @@ index 080587e..853bf9d 100644 && chipinfo->rev == 0) ohci_addr = 0x18009000; --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch b/target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch index 32a17653de..700d354332 100644 --- a/target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch +++ b/target/linux/bcm53xx/patches-3.18/182-USB-bcma-use-devm_kzalloc.patch @@ -11,11 +11,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> drivers/usb/host/bcma-hcd.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) -diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c -index 853bf9d..d7ea50d 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c -@@ -225,7 +225,8 @@ static int bcma_hcd_probe(struct bcma_device *dev) +@@ -225,7 +225,8 @@ static int bcma_hcd_probe(struct bcma_de if (dma_set_mask_and_coherent(dev->dma_dev, DMA_BIT_MASK(32))) return -EOPNOTSUPP; @@ -25,7 +23,7 @@ index 853bf9d..d7ea50d 100644 if (!usb_dev) return -ENOMEM; -@@ -239,10 +240,8 @@ static int bcma_hcd_probe(struct bcma_device *dev) +@@ -239,10 +240,8 @@ static int bcma_hcd_probe(struct bcma_de ohci_addr = 0x18009000; usb_dev->ohci_dev = bcma_hcd_create_pdev(dev, true, ohci_addr); @@ -38,7 +36,7 @@ index 853bf9d..d7ea50d 100644 usb_dev->ehci_dev = bcma_hcd_create_pdev(dev, false, dev->addr); if (IS_ERR(usb_dev->ehci_dev)) { -@@ -255,8 +254,6 @@ static int bcma_hcd_probe(struct bcma_device *dev) +@@ -255,8 +254,6 @@ static int bcma_hcd_probe(struct bcma_de err_unregister_ohci_dev: platform_device_unregister(usb_dev->ohci_dev); @@ -47,6 +45,3 @@ index 853bf9d..d7ea50d 100644 return err; } --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch b/target/linux/bcm53xx/patches-3.18/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch index 799c93ef41..91cd0fa320 100644 --- a/target/linux/bcm53xx/patches-3.18/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch +++ b/target/linux/bcm53xx/patches-3.18/183-USB-bcma-fix-error-handling-in-bcma_hcd_create_pdev.patch @@ -11,11 +11,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> drivers/usb/host/bcma-hcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c -index d7ea50d..8a38313 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c -@@ -169,7 +169,7 @@ static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, boo +@@ -169,7 +169,7 @@ static struct platform_device *bcma_hcd_ { struct platform_device *hci_dev; struct resource hci_res[2]; @@ -24,7 +22,7 @@ index d7ea50d..8a38313 100644 memset(hci_res, 0, sizeof(hci_res)); -@@ -183,7 +183,7 @@ static struct platform_device *bcma_hcd_create_pdev(struct bcma_device *dev, boo +@@ -183,7 +183,7 @@ static struct platform_device *bcma_hcd_ hci_dev = platform_device_alloc(ohci ? "ohci-platform" : "ehci-platform" , 0); if (!hci_dev) @@ -33,6 +31,3 @@ index d7ea50d..8a38313 100644 hci_dev->dev.parent = &dev->dev; hci_dev->dev.dma_mask = &hci_dev->dev.coherent_dma_mask; --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/184-USB-bcma-add-bcm53xx-support.patch b/target/linux/bcm53xx/patches-3.18/184-USB-bcma-add-bcm53xx-support.patch index d7980fa4fa..920efdcab4 100644 --- a/target/linux/bcm53xx/patches-3.18/184-USB-bcma-add-bcm53xx-support.patch +++ b/target/linux/bcm53xx/patches-3.18/184-USB-bcma-add-bcm53xx-support.patch @@ -13,8 +13,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> drivers/usb/host/bcma-hcd.c | 81 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) -diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c -index 8a38313..983bc67 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c @@ -2,7 +2,8 @@ @@ -27,7 +25,7 @@ index 8a38313..983bc67 100644 * * Based on ssb-ohci driver * Copyright 2007 Michael Buesch <m@bues.ch> -@@ -88,7 +89,7 @@ static void bcma_hcd_4716wa(struct bcma_device *dev) +@@ -88,7 +89,7 @@ static void bcma_hcd_4716wa(struct bcma_ } /* based on arch/mips/brcm-boards/bcm947xx/pcibios.c */ @@ -36,7 +34,7 @@ index 8a38313..983bc67 100644 { u32 tmp; -@@ -159,6 +160,70 @@ static void bcma_hcd_init_chip(struct bcma_device *dev) +@@ -159,6 +160,70 @@ static void bcma_hcd_init_chip(struct bc } } @@ -107,7 +105,7 @@ index 8a38313..983bc67 100644 static const struct usb_ehci_pdata ehci_pdata = { }; -@@ -230,7 +295,16 @@ static int bcma_hcd_probe(struct bcma_device *dev) +@@ -230,7 +295,16 @@ static int bcma_hcd_probe(struct bcma_de if (!usb_dev) return -ENOMEM; @@ -125,7 +123,7 @@ index 8a38313..983bc67 100644 /* In AI chips EHCI is addrspace 0, OHCI is 1 */ ohci_addr = dev->addr_s[0]; -@@ -299,6 +373,7 @@ static int bcma_hcd_resume(struct bcma_device *dev) +@@ -299,6 +373,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), @@ -133,6 +131,3 @@ index 8a38313..983bc67 100644 BCMA_CORETABLE_END }; MODULE_DEVICE_TABLE(bcma, bcma_hcd_table); --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/185-USB-bcma-add-support-for-controlling-bus-power-throu.patch b/target/linux/bcm53xx/patches-3.18/185-USB-bcma-add-support-for-controlling-bus-power-throu.patch index 8a00141b8f..d9a8a1e621 100644 --- a/target/linux/bcm53xx/patches-3.18/185-USB-bcma-add-support-for-controlling-bus-power-throu.patch +++ b/target/linux/bcm53xx/patches-3.18/185-USB-bcma-add-support-for-controlling-bus-power-throu.patch @@ -12,8 +12,6 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> drivers/usb/host/bcma-hcd.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c -index 983bc67..a01c6ce 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c @@ -24,6 +24,8 @@ @@ -25,7 +23,7 @@ index 983bc67..a01c6ce 100644 #include <linux/usb/ehci_pdriver.h> #include <linux/usb/ohci_pdriver.h> -@@ -224,6 +226,23 @@ static void bcma_hcd_init_chip_arm(struct bcma_device *dev) +@@ -224,6 +226,23 @@ static void bcma_hcd_init_chip_arm(struc } } @@ -49,7 +47,7 @@ index 983bc67..a01c6ce 100644 static const struct usb_ehci_pdata ehci_pdata = { }; -@@ -295,6 +314,8 @@ static int bcma_hcd_probe(struct bcma_device *dev) +@@ -295,6 +314,8 @@ static int bcma_hcd_probe(struct bcma_de if (!usb_dev) return -ENOMEM; @@ -58,7 +56,7 @@ index 983bc67..a01c6ce 100644 switch (dev->id.id) { case BCMA_CORE_NS_USB20: bcma_hcd_init_chip_arm(dev); -@@ -347,6 +368,7 @@ static void bcma_hcd_remove(struct bcma_device *dev) +@@ -347,6 +368,7 @@ static void bcma_hcd_remove(struct bcma_ static void bcma_hcd_shutdown(struct bcma_device *dev) { @@ -66,7 +64,7 @@ index 983bc67..a01c6ce 100644 bcma_core_disable(dev, 0); } -@@ -354,6 +376,7 @@ static void bcma_hcd_shutdown(struct bcma_device *dev) +@@ -354,6 +376,7 @@ static void bcma_hcd_shutdown(struct bcm static int bcma_hcd_suspend(struct bcma_device *dev) { @@ -74,7 +72,7 @@ index 983bc67..a01c6ce 100644 bcma_core_disable(dev, 0); return 0; -@@ -361,6 +384,7 @@ static int bcma_hcd_suspend(struct bcma_device *dev) +@@ -361,6 +384,7 @@ static int bcma_hcd_suspend(struct bcma_ static int bcma_hcd_resume(struct bcma_device *dev) { @@ -82,6 +80,3 @@ index 983bc67..a01c6ce 100644 bcma_core_enable(dev, 0); return 0; --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch index a52efea29f..ca6462e3c7 100644 --- a/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch +++ b/target/linux/bcm53xx/patches-3.18/301-ARM-BCM5301X-Add-SPROM.patch @@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> arch/arm/boot/dts/bcm5301x.dtsi | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi -index 21fefd4..58515f8 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -95,6 +95,10 @@ @@ -26,6 +24,3 @@ index 21fefd4..58515f8 100644 axi@18000000 { compatible = "brcm,bus-axi"; reg = <0x18000000 0x1000>; --- -1.8.4.5 - diff --git a/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-back-Luxul-XWC-1000-NAND-flash-layo.patch b/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-back-Luxul-XWC-1000-NAND-flash-layo.patch index ae9936291b..df65e0d03d 100644 --- a/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-back-Luxul-XWC-1000-NAND-flash-layo.patch +++ b/target/linux/bcm53xx/patches-3.18/352-ARM-BCM5301X-Add-back-Luxul-XWC-1000-NAND-flash-layo.patch @@ -14,8 +14,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts -index b84a503..413978a 100644 --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts @@ -34,6 +34,18 @@ @@ -37,6 +35,3 @@ index b84a503..413978a 100644 nand: nand@18028000 { nandcs@0 { partition@0 { --- -1.8.4.5 - |