aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.4/372_dont_register_pflash_when_available_in_dtb.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-12-02 22:24:46 +0000
committerJonas Gorski <jogo@openwrt.org>2015-12-02 22:24:46 +0000
commit8f08d1e7a25c1a30e4d90d4d0492daa2e9862f18 (patch)
treee2bb70e19466724b515d2c03a67167df2807cef3 /target/linux/brcm63xx/patches-4.4/372_dont_register_pflash_when_available_in_dtb.patch
parent9da189b6160422c8fe396181ff2d496fa68408b2 (diff)
downloadmaster-187ad058-8f08d1e7a25c1a30e4d90d4d0492daa2e9862f18.tar.gz
master-187ad058-8f08d1e7a25c1a30e4d90d4d0492daa2e9862f18.tar.bz2
master-187ad058-8f08d1e7a25c1a30e4d90d4d0492daa2e9862f18.zip
brcm63xx: add linux 4.4 support
Only netboot tested. Flash at your own risk. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47702 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/372_dont_register_pflash_when_available_in_dtb.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.4/372_dont_register_pflash_when_available_in_dtb.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/372_dont_register_pflash_when_available_in_dtb.patch b/target/linux/brcm63xx/patches-4.4/372_dont_register_pflash_when_available_in_dtb.patch
new file mode 100644
index 0000000000..25384ebb68
--- /dev/null
+++ b/target/linux/brcm63xx/patches-4.4/372_dont_register_pflash_when_available_in_dtb.patch
@@ -0,0 +1,21 @@
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -23,6 +23,8 @@
+ #include <bcm63xx_regs.h>
+ #include <bcm63xx_io.h>
+
++#include "boards/board_common.h"
++
+ static int flash_type;
+
+ static struct mtd_partition mtd_partitions[] = {
+@@ -178,6 +180,9 @@ int __init bcm63xx_flash_register(void)
+
+ switch (flash_type) {
+ case BCM63XX_FLASH_TYPE_PARALLEL:
++ /* don't register when already registered through from dtb */
++ if (board_of_device_present("pflash"))
++ return 0;
+
+ if (!mtd_resources[0].start) {
+ /* read base address of boot chip select (0) */