MIPS: BCM63XX: add flash detection for BCM6362

BCM6362 support booting from SPI flash and NAND.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5012/
Acked-by: John Crispin <blogic@openwrt.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/arch/mips/bcm63xx/dev-flash.c b/arch/mips/bcm63xx/dev-flash.c
index 58371c7deac2..588d1ec622e4 100644
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
@@ -77,6 +77,12 @@ static int __init bcm63xx_detect_flash_type(void)
                         return BCM63XX_FLASH_TYPE_PARALLEL;
                 else
                         return BCM63XX_FLASH_TYPE_SERIAL;
+        case BCM6362_CPU_ID:
+                val = bcm_misc_readl(MISC_STRAPBUS_6362_REG);
+                if (val & STRAPBUS_6362_BOOT_SEL_SERIAL)
+                        return BCM63XX_FLASH_TYPE_SERIAL;
+                else
+                        return BCM63XX_FLASH_TYPE_NAND;
         case BCM6368_CPU_ID:
                 val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
                 switch (val & STRAPBUS_6368_BOOT_SEL_MASK) {