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 | 1057e53813d09260e588ba9dda8553c8146d3fc4 (patch) | |
| tree | b4d3d8047d600d1c4ca78594eb714010c439c498 /target/linux/brcm63xx/patches-3.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch | |
| parent | a030157d7689aef35516d90e036eea69860334b9 (diff) | |
| download | master-187ad058-1057e53813d09260e588ba9dda8553c8146d3fc4.tar.gz master-187ad058-1057e53813d09260e588ba9dda8553c8146d3fc4.tar.bz2 master-187ad058-1057e53813d09260e588ba9dda8553c8146d3fc4.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42123 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/brcm63xx/patches-3.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch index bc10d96635..5fe2078466 100644 --- a/target/linux/brcm63xx/patches-3.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch +++ b/target/linux/brcm63xx/patches-3.14/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch @@ -24,7 +24,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> #include <bcm63xx_regs.h> #include <bcm63xx_io.h> -@@ -63,6 +66,21 @@ void __init bcm63xx_flash_force_phys_bas +@@ -65,6 +68,21 @@ void __init bcm63xx_flash_force_phys_bas mtd_resources[0].end = end; } @@ -46,7 +46,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> static int __init bcm63xx_detect_flash_type(void) { u32 val; -@@ -70,9 +88,15 @@ static int __init bcm63xx_detect_flash_t +@@ -72,9 +90,15 @@ static int __init bcm63xx_detect_flash_t switch (bcm63xx_get_cpu_id()) { case BCM6318_CPU_ID: /* only support serial flash */ @@ -62,7 +62,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> if (val & STRAPBUS_6328_BOOT_SEL_SERIAL) return BCM63XX_FLASH_TYPE_SERIAL; else -@@ -91,12 +115,20 @@ static int __init bcm63xx_detect_flash_t +@@ -93,12 +117,20 @@ static int __init bcm63xx_detect_flash_t return BCM63XX_FLASH_TYPE_SERIAL; case BCM6362_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_6362_REG); @@ -83,7 +83,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { case STRAPBUS_6368_BOOT_SEL_NAND: return BCM63XX_FLASH_TYPE_NAND; -@@ -107,6 +139,11 @@ static int __init bcm63xx_detect_flash_t +@@ -109,6 +141,11 @@ static int __init bcm63xx_detect_flash_t } case BCM63268_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_63268_REG); @@ -95,7 +95,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> if (val & STRAPBUS_63268_BOOT_SEL_SERIAL) return BCM63XX_FLASH_TYPE_SERIAL; else -@@ -176,8 +213,15 @@ int __init bcm63xx_flash_register(void) +@@ -181,8 +218,15 @@ int __init bcm63xx_flash_register(void) return platform_device_register(&mtd_dev); case BCM63XX_FLASH_TYPE_SERIAL: |