diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-22 12:28:46 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-22 12:28:46 +0000 |
| commit | 550f57596500c9ab9adb4907ddb93c5d15be2093 (patch) | |
| tree | be8dee15b0ab94f8a1a116ba309e24bdfde348ed /target/linux/brcm63xx/patches-4.1/372_dont_register_pflash_when_available_in_dtb.patch | |
| parent | dc18617098592901d24daa1fce6734e9c62cbef1 (diff) | |
| download | master-187ad058-550f57596500c9ab9adb4907ddb93c5d15be2093.tar.gz master-187ad058-550f57596500c9ab9adb4907ddb93c5d15be2093.tar.bz2 master-187ad058-550f57596500c9ab9adb4907ddb93c5d15be2093.zip | |
brcm63xx: add kernel 4.1 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46113 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-4.1/372_dont_register_pflash_when_available_in_dtb.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-4.1/372_dont_register_pflash_when_available_in_dtb.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-4.1/372_dont_register_pflash_when_available_in_dtb.patch b/target/linux/brcm63xx/patches-4.1/372_dont_register_pflash_when_available_in_dtb.patch new file mode 100644 index 0000000000..88efc2360b --- /dev/null +++ b/target/linux/brcm63xx/patches-4.1/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 +@@ -22,6 +22,8 @@ + #include <bcm63xx_regs.h> + #include <bcm63xx_io.h> + ++#include "boards/board_common.h" ++ + static int flash_type; + + static struct mtd_partition mtd_partitions[] = { +@@ -164,6 +166,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) */ |