X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-4.4%2F372_dont_register_pflash_when_available_in_dtb.patch;fp=target%2Flinux%2Fbrcm63xx%2Fpatches-4.4%2F372_dont_register_pflash_when_available_in_dtb.patch;h=25384ebb68d3381d19504211df7b33462bfef79a;hb=1607b6ca708e71f1f092bc191c03a9d258a15562;hp=0000000000000000000000000000000000000000;hpb=a45fb9ceb31d65b9ccb33fe5cd786eb99dcbbec5;p=openwrt%2Fsvn-archive%2Farchive.git

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) */