diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-17 19:07:23 +0100 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-02-17 20:40:16 +0100 |
commit | f323dec4f866d9ea75eae11c6762d0144d100628 (patch) | |
tree | c40f33e9a89e935b32e6a1520f02019200e7cc17 /target/linux/bcm63xx/patches-5.10/372_dont_register_pflash_when_available_in_dtb.patch | |
parent | 5bb9954826229782d4d285d65dfcca8a1c9e20d9 (diff) | |
download | upstream-f323dec4f866d9ea75eae11c6762d0144d100628.tar.gz upstream-f323dec4f866d9ea75eae11c6762d0144d100628.tar.bz2 upstream-f323dec4f866d9ea75eae11c6762d0144d100628.zip |
bcm63xx: add kernel 5.10 support
Runtime-tested on Comtrend AR-5387un.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.10/372_dont_register_pflash_when_available_in_dtb.patch')
-rw-r--r-- | target/linux/bcm63xx/patches-5.10/372_dont_register_pflash_when_available_in_dtb.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/target/linux/bcm63xx/patches-5.10/372_dont_register_pflash_when_available_in_dtb.patch b/target/linux/bcm63xx/patches-5.10/372_dont_register_pflash_when_available_in_dtb.patch new file mode 100644 index 0000000000..af0800f5aa --- /dev/null +++ b/target/linux/bcm63xx/patches-5.10/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[] = { +@@ -179,6 +181,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) */ |