diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-12-02 22:24:46 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-12-02 22:24:46 +0000 |
commit | e395433178224ff1e2a6053105d12936b46c7576 (patch) | |
tree | 6fd6e2bb8019d78d1b8a57d63516ebbe3cff47f6 /target/linux/brcm63xx/patches-4.4/372_dont_register_pflash_when_available_in_dtb.patch | |
parent | 621677154f39f2e0b698a558b8b795db84a8e014 (diff) | |
download | upstream-e395433178224ff1e2a6053105d12936b46c7576.tar.gz upstream-e395433178224ff1e2a6053105d12936b46c7576.tar.bz2 upstream-e395433178224ff1e2a6053105d12936b46c7576.zip |
brcm63xx: add linux 4.4 support
Only netboot tested. Flash at your own risk.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 47702
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.patch | 21 |
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) */ |