From a91ec2f50f4e64ec4b83c3f6e9d9f07104c035c7 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 1 Dec 2014 13:27:26 +0000 Subject: brcm63xx: add kernel 3.18 support Add 3.18 support based on 3.18-rc6. Only netboot tested. Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43461 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...dont_register_pflash_when_available_in_dtb.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 target/linux/brcm63xx/patches-3.18/372_dont_register_pflash_when_available_in_dtb.patch (limited to 'target/linux/brcm63xx/patches-3.18/372_dont_register_pflash_when_available_in_dtb.patch') 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 + #include + ++#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) */ -- cgit v1.2.3