diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-12-01 13:27:26 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-12-01 13:27:26 +0000 |
| commit | 387fd3ca26d53ac806a38c4e951aa7e31d2ef0e7 (patch) | |
| tree | 67ee9cbaab88a81e3ae733c18a8069e1beb6fb23 /target/linux/brcm63xx/patches-3.18/372_dont_register_pflash_when_available_in_dtb.patch | |
| parent | 100e2feb22e6f51584dcc06812c2cdf9dc9fb52c (diff) | |
| download | master-31e0f0ae-387fd3ca26d53ac806a38c4e951aa7e31d2ef0e7.tar.gz master-31e0f0ae-387fd3ca26d53ac806a38c4e951aa7e31d2ef0e7.tar.bz2 master-31e0f0ae-387fd3ca26d53ac806a38c4e951aa7e31d2ef0e7.zip | |
brcm63xx: add kernel 3.18 support
Add 3.18 support based on 3.18-rc6. Only netboot tested.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 43461
Diffstat (limited to 'target/linux/brcm63xx/patches-3.18/372_dont_register_pflash_when_available_in_dtb.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.18/372_dont_register_pflash_when_available_in_dtb.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.18/372_dont_register_pflash_when_available_in_dtb.patch b/target/linux/brcm63xx/patches-3.18/372_dont_register_pflash_when_available_in_dtb.patch new file mode 100644 index 0000000000..88efc2360b --- /dev/null +++ b/target/linux/brcm63xx/patches-3.18/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) */ |