diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-08-11 11:37:01 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-08-11 11:37:01 +0000 |
| commit | 9c6287d6a14b7f7105e4b61774c5310cb96489c3 (patch) | |
| tree | 9d73aef68371873277ac1764244d0977f0661029 /target/linux/brcm63xx/patches-3.14/372_dont_register_pflash_when_available_in_dtb.patch | |
| parent | 79057c72551647fdb5ebaac28eccd6b21e28ddca (diff) | |
| download | master-31e0f0ae-9c6287d6a14b7f7105e4b61774c5310cb96489c3.tar.gz master-31e0f0ae-9c6287d6a14b7f7105e4b61774c5310cb96489c3.tar.bz2 master-31e0f0ae-9c6287d6a14b7f7105e4b61774c5310cb96489c3.zip | |
brcm63xx: add support for registering parallel flash through dtb
Add the required nodes to the dtsi files and code to prevent double
registration from the board support code.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 42123
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/372_dont_register_pflash_when_available_in_dtb.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.14/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.14/372_dont_register_pflash_when_available_in_dtb.patch b/target/linux/brcm63xx/patches-3.14/372_dont_register_pflash_when_available_in_dtb.patch new file mode 100644 index 0000000000..88efc2360b --- /dev/null +++ b/target/linux/brcm63xx/patches-3.14/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) */ |