mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-10-19 14:08:17 +02:00
Code Issues

bcm53xx: refresh patches

Browse Source 
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 43144
This commit is contained in:
Hauke Mehrtens 2014-11-01 13:55:02 +00:00
parent bc356cef82
commit 8e20cceeae
13 changed files with 9 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/bcm53xx/patches-3.14/046-ARM-BCM5301X-Add-Broadcom-s-bus-axi-to-the-DTS-file.patch
View File

@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
arch/arm/boot/dts/bcm5301x.dtsi | 16 ++++++++++++++++ arch/arm/boot/dts/bcm5301x.dtsi | 16 ++++++++++++++++
1 file changed, 16 insertions(+) 1 file changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index 53c624f..6d80922 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi --- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
@ -43,6 +41,3 @@ index 53c624f..6d80922 100644
+ }; + };
+ }; + };
}; };
--
1.8.4.5

5
target/linux/bcm53xx/patches-3.14/047-ARM-BCM5301X-Add-LEDs-for-Netgear-R6250-V1.patch
View File

@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 34 +++++++++++++++++++++++++++++ arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 34 +++++++++++++++++++++++++++++
1 file changed, 34 insertions(+) 1 file changed, 34 insertions(+)
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
index 3b5259d..58d999d 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
@@ -32,4 +32,38 @@ @@ -32,4 +32,38 @@
@ -54,6 +52,3 @@ index 3b5259d..58d999d 100644
+ }; + };
+ }; + };
}; };
--
1.8.4.5

13
target/linux/bcm53xx/patches-3.14/122-bcma-fill-core-details-for-every-device.patch
View File

@ -17,8 +17,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/bcma/scan.c | 1 + drivers/bcma/scan.c | 1 +
3 files changed, 8 insertions(+), 3 deletions(-) 3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index b6412b2..314ae40 100644
--- a/drivers/bcma/bcma_private.h --- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h
@@ -24,6 +24,7 @@ struct bcma_bus; @@ -24,6 +24,7 @@ struct bcma_bus;
@ -29,11 +27,9 @@ index b6412b2..314ae40 100644
int bcma_bus_register(struct bcma_bus *bus); int bcma_bus_register(struct bcma_bus *bus);
void bcma_bus_unregister(struct bcma_bus *bus); void bcma_bus_unregister(struct bcma_bus *bus);
int __init bcma_bus_early_register(struct bcma_bus *bus, int __init bcma_bus_early_register(struct bcma_bus *bus,
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 5e7a3d4..70d0f23 100644
--- a/drivers/bcma/main.c --- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c +++ b/drivers/bcma/main.c
@@ -172,10 +172,8 @@ static void bcma_of_fill_device(struct platform_device *parent, @@ -172,10 +172,8 @@ static void bcma_of_fill_device(struct p
} }
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
@ -45,7 +41,7 @@ index 5e7a3d4..70d0f23 100644
core->dev.release = bcma_release_core_dev; core->dev.release = bcma_release_core_dev;
core->dev.bus = &bcma_bus_type; core->dev.bus = &bcma_bus_type;
dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index); dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
@@ -199,6 +197,11 @@ static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core) @@ -199,6 +197,11 @@ static void bcma_register_core(struct bc
case BCMA_HOSTTYPE_SDIO: case BCMA_HOSTTYPE_SDIO:
break; break;
} }
@ -57,8 +53,6 @@ index 5e7a3d4..70d0f23 100644
err = device_register(&core->dev); err = device_register(&core->dev);
if (err) { if (err) {
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 14b5656..9175207 100644
--- a/drivers/bcma/scan.c --- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c +++ b/drivers/bcma/scan.c
@@ -505,6 +505,7 @@ int bcma_bus_scan(struct bcma_bus *bus) @@ -505,6 +505,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
@ -69,6 +63,3 @@ index 14b5656..9175207 100644
bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n", bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
core->core_index, bcma_device_name(&core->id), core->core_index, bcma_device_name(&core->id),
--
1.8.4.5

11
target/linux/bcm53xx/patches-3.14/300-ARM-BCM5301X-Disable-MMU-and-Dcache-for-decompression.patch
View File

@ -18,8 +18,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
create mode 100644 arch/arm/boot/compressed/head-bcm_5301x-mpcore.S create mode 100644 arch/arm/boot/compressed/head-bcm_5301x-mpcore.S
create mode 100644 arch/arm/boot/compressed/mpcore_cache.S create mode 100644 arch/arm/boot/compressed/mpcore_cache.S
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 9312edc..ce7438c 100644
--- a/arch/arm/boot/compressed/Makefile --- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile
@@ -44,6 +44,11 @@ ifeq ($(CONFIG_ARCH_ACORN),y) @@ -44,6 +44,11 @@ ifeq ($(CONFIG_ARCH_ACORN),y)
@ -34,9 +32,6 @@ index 9312edc..ce7438c 100644
ifeq ($(CONFIG_ARCH_SA1100),y) ifeq ($(CONFIG_ARCH_SA1100),y)
OBJS += head-sa1100.o OBJS += head-sa1100.o
endif endif
diff --git a/arch/arm/boot/compressed/head-bcm_5301x-mpcore.S b/arch/arm/boot/compressed/head-bcm_5301x-mpcore.S
new file mode 100644
index 0000000..fd076a0
--- /dev/null --- /dev/null
+++ b/arch/arm/boot/compressed/head-bcm_5301x-mpcore.S +++ b/arch/arm/boot/compressed/head-bcm_5301x-mpcore.S
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
@ -77,9 +72,6 @@ index 0000000..fd076a0
+ +
+ @ Restore + @ Restore
+ mov r8, r12 + mov r8, r12
diff --git a/arch/arm/boot/compressed/mpcore_cache.S b/arch/arm/boot/compressed/mpcore_cache.S
new file mode 100644
index 0000000..ada734c
--- /dev/null --- /dev/null
+++ b/arch/arm/boot/compressed/mpcore_cache.S +++ b/arch/arm/boot/compressed/mpcore_cache.S
@@ -0,0 +1,118 @@ @@ -0,0 +1,118 @@
@ -201,6 +193,3 @@ index 0000000..ada734c
+ isb + isb
+ mov pc, lr + mov pc, lr
+ENDPROC(v7_all_dcache_invalidate) +ENDPROC(v7_all_dcache_invalidate)
--
1.8.4.5

7
target/linux/bcm53xx/patches-3.14/301-ARM-BCM5301X-Add-buttons-support-for-Netgear-R6250.patch
View File

@ -15,8 +15,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
arch/arm/boot/dts/bcm5301x.dtsi | 1 + arch/arm/boot/dts/bcm5301x.dtsi | 1 +
2 files changed, 26 insertions(+) 2 files changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
index 58d999d..c5e51e5 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts --- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts +++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
@@ -66,4 +66,29 @@ @@ -66,4 +66,29 @@
@ -49,8 +47,6 @@ index 58d999d..c5e51e5 100644
+ }; + };
+ }; + };
}; };
diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index dbcd7a3..54fe4d0 100644
--- a/arch/arm/boot/dts/bcm5301x.dtsi --- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
@ -61,6 +57,3 @@ index dbcd7a3..54fe4d0 100644
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi" #include "skeleton.dtsi"
--
1.8.4.5

4
target/linux/bcm53xx/patches-3.14/302-ARM-BCM5301X-Add-DT-for-Netgear-R6300-V2.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
2 files changed, 38 insertions(+), 1 deletion(-) 2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts create mode 100644 arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 15ae11c..3e43f17 100644
--- a/arch/arm/boot/dts/Makefile --- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile
@@ -50,7 +50,9 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb @@ -50,7 +50,9 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rp
dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \ dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
bcm28155-ap.dtb bcm28155-ap.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb

10
target/linux/bcm53xx/patches-3.14/303-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-1750DHP.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
2 files changed, 75 insertions(+) 2 files changed, 75 insertions(+)
create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts create mode 100644 arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 3e43f17..17c717b 100644
--- a/arch/arm/boot/dts/Makefile --- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile
@@ -51,6 +51,7 @@ dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \ @@ -51,6 +51,7 @@ dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm1135
bcm28155-ap.dtb bcm28155-ap.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
dtb-$(CONFIG_ARCH_BCM_5301X) += \ dtb-$(CONFIG_ARCH_BCM_5301X) += \
@ -25,9 +23,6 @@ index 3e43f17..17c717b 100644
bcm4708-netgear-r6250.dtb \ bcm4708-netgear-r6250.dtb \
bcm4708-netgear-r6300-v2.dtb bcm4708-netgear-r6300-v2.dtb
dtb-$(CONFIG_ARCH_BERLIN) += \ dtb-$(CONFIG_ARCH_BERLIN) += \
diff --git a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
new file mode 100644
index 0000000..63e9e5f
--- /dev/null --- /dev/null
+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
@ -105,6 +100,3 @@ index 0000000..63e9e5f
+ }; + };
+ }; + };
+}; +};
--
1.8.4.5

17
target/linux/bcm53xx/patches-3.14/304-ARM-BCM5301X-Add-DT-for-Asus-RT-N18U.patch
View File

@ -16,11 +16,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
create mode 100644 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts create mode 100644 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
create mode 100644 arch/arm/boot/dts/bcm47081.dtsi create mode 100644 arch/arm/boot/dts/bcm47081.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 17c717b..330e0e0 100644
--- a/arch/arm/boot/dts/Makefile --- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile
@@ -53,7 +53,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb @@ -53,7 +53,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rp
dtb-$(CONFIG_ARCH_BCM_5301X) += \ dtb-$(CONFIG_ARCH_BCM_5301X) += \
bcm4708-buffalo-wzr-1750dhp.dtb \ bcm4708-buffalo-wzr-1750dhp.dtb \
bcm4708-netgear-r6250.dtb \ bcm4708-netgear-r6250.dtb \
@ -30,9 +28,6 @@ index 17c717b..330e0e0 100644
dtb-$(CONFIG_ARCH_BERLIN) += \ dtb-$(CONFIG_ARCH_BERLIN) += \
berlin2-sony-nsz-gs7.dtb \ berlin2-sony-nsz-gs7.dtb \
berlin2cd-google-chromecast.dtb berlin2cd-google-chromecast.dtb
diff --git a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
new file mode 100644
index 0000000..cf8e9a5
--- /dev/null --- /dev/null
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts +++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
@@ -0,0 +1,88 @@ @@ -0,0 +1,88 @@
@ -124,9 +119,6 @@ index 0000000..cf8e9a5
+ }; + };
+ }; + };
+}; +};
diff --git a/arch/arm/boot/dts/bcm47081.dtsi b/arch/arm/boot/dts/bcm47081.dtsi
new file mode 100644
index 0000000..f720012
--- /dev/null --- /dev/null
+++ b/arch/arm/boot/dts/bcm47081.dtsi +++ b/arch/arm/boot/dts/bcm47081.dtsi
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
@ -156,11 +148,9 @@ index 0000000..f720012
+ }; + };
+ }; + };
+}; +};
diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c
index b0a6da9..de29646 100644
--- a/arch/arm/mach-bcm/bcm_5301x.c --- a/arch/arm/mach-bcm/bcm_5301x.c
+++ b/arch/arm/mach-bcm/bcm_5301x.c +++ b/arch/arm/mach-bcm/bcm_5301x.c
@@ -81,6 +81,7 @@ static void bcm5301x_restart(enum reboot_mode mode, const char *cmd) @@ -81,6 +81,7 @@ static void bcm5301x_restart(enum reboot
static const char __initconst *bcm5301x_dt_compat[] = { static const char __initconst *bcm5301x_dt_compat[] = {
"brcm,bcm4708", "brcm,bcm4708",
@ -168,6 +158,3 @@ index b0a6da9..de29646 100644
NULL, NULL,
}; };
--
1.8.4.5

8
target/linux/bcm53xx/patches-3.14/305-ARM-BCM5301X-Add-DT-for-Buffalo-WZR-600DHP2.patch
View File

@ -13,8 +13,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
2 files changed, 69 insertions(+), 1 deletion(-) 2 files changed, 69 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts create mode 100644 arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 330e0e0..64c8f3f 100644
--- a/arch/arm/boot/dts/Makefile --- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile
@@ -54,7 +54,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ @@ -54,7 +54,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
@ -27,9 +25,6 @@ index 330e0e0..64c8f3f 100644
dtb-$(CONFIG_ARCH_BERLIN) += \ dtb-$(CONFIG_ARCH_BERLIN) += \
berlin2-sony-nsz-gs7.dtb \ berlin2-sony-nsz-gs7.dtb \
berlin2cd-google-chromecast.dtb berlin2cd-google-chromecast.dtb
diff --git a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
new file mode 100644
index 0000000..84de5de
--- /dev/null --- /dev/null
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
@@ -0,0 +1,67 @@ @@ -0,0 +1,67 @@
@ -100,6 +95,3 @@ index 0000000..84de5de
+ }; + };
+ }; + };
+}; +};
--
1.8.4.5

2
target/linux/bcm53xx/patches-3.14/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/spi-nor/Kconfig --- a/drivers/mtd/spi-nor/Kconfig
+++ b/drivers/mtd/spi-nor/Kconfig +++ b/drivers/mtd/spi-nor/Kconfig
@@ -14,4 +14,10 @@ config SPI_FSL_QUADSPI @@ -28,4 +28,10 @@ config SPI_FSL_QUADSPI
This enables support for the Quad SPI controller in master mode. This enables support for the Quad SPI controller in master mode.
We only connect the NOR to this controller now. We only connect the NOR to this controller now.

5
target/linux/bcm53xx/patches-3.14/410-mtd-bcm47xxpart-alloc-memory-for-more-partitions.patch
View File

@ -13,8 +13,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/mtd/bcm47xxpart.c | 8 ++++++-- drivers/mtd/bcm47xxpart.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-) 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 8057f52..f2db4d7 100644
--- a/drivers/mtd/bcm47xxpart.c --- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c
@@ -15,8 +15,12 @@ @@ -15,8 +15,12 @@
@ -32,6 +30,3 @@ index 8057f52..f2db4d7 100644
/* /*
* Amount of bytes we read when analyzing each block of flash memory. * Amount of bytes we read when analyzing each block of flash memory.
--
1.8.4.5

7
target/linux/bcm53xx/patches-3.14/500-UBI-Detect-EOF-mark-and-erase-all-remaining-blocks.patch
View File

@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/mtd/ubi/io.c | 5 +++++ drivers/mtd/ubi/io.c | 5 +++++
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index d361349..f9bba3c 100644
--- a/drivers/mtd/ubi/io.c --- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c
@@ -727,6 +727,7 @@ bad: @@ -727,6 +727,7 @@ bad:
@ -23,7 +21,7 @@ index d361349..f9bba3c 100644
int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum, int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum,
struct ubi_ec_hdr *ec_hdr, int verbose) struct ubi_ec_hdr *ec_hdr, int verbose)
{ {
@@ -753,6 +754,10 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum, @@ -753,6 +754,10 @@ int ubi_io_read_ec_hdr(struct ubi_device
} }
magic = be32_to_cpu(ec_hdr->magic); magic = be32_to_cpu(ec_hdr->magic);
@ -34,6 +32,3 @@ index d361349..f9bba3c 100644
if (magic != UBI_EC_HDR_MAGIC) { if (magic != UBI_EC_HDR_MAGIC) {
if (mtd_is_eccerr(read_err)) if (mtd_is_eccerr(read_err))
return UBI_IO_BAD_HDR_EBADMSG; return UBI_IO_BAD_HDR_EBADMSG;
--
1.8.4.5

7
target/linux/bcm53xx/patches-3.14/901-bcma-register-SoC-later-as-a-module.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/bcma/host_soc.c | 12 ++++++++++-- drivers/bcma/host_soc.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-) 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/bcma/host_soc.c b/drivers/bcma/host_soc.c
index 335cbcf..c7e12f2 100644
--- a/drivers/bcma/host_soc.c --- a/drivers/bcma/host_soc.c
+++ b/drivers/bcma/host_soc.c +++ b/drivers/bcma/host_soc.c
@@ -265,14 +265,22 @@ static struct platform_driver bcma_host_soc_driver = { @@ -265,14 +265,22 @@ static struct platform_driver bcma_host_
.probe = bcma_host_soc_probe, .probe = bcma_host_soc_probe,
.remove = bcma_host_soc_remove, .remove = bcma_host_soc_remove,
}; };
@ -42,6 +40,3 @@ index 335cbcf..c7e12f2 100644
+ /* platform_driver_unregister(&bcma_host_soc_driver); */ + /* platform_driver_unregister(&bcma_host_soc_driver); */
} }
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
--
1.8.4.5