summaryrefslogtreecommitdiffstats
path: root/arch/mips/bcm63xx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-03-21 14:03:20 +0000
committerRalf Baechle <ralf@linux-mips.org>2013-05-08 01:19:03 +0200
commitab8ed9820f5645d0b5b81ef17bbcbd1cdd43a4fa (patch)
tree7e3554f0f7d5d3cc8b36a628167d66337e0e291c /arch/mips/bcm63xx
parenta156ba61f0b959a803d7a6941a52c5453524c99b (diff)
downloadlinux-ab8ed9820f5645d0b5b81ef17bbcbd1cdd43a4fa.tar.gz
linux-ab8ed9820f5645d0b5b81ef17bbcbd1cdd43a4fa.tar.bz2
linux-ab8ed9820f5645d0b5b81ef17bbcbd1cdd43a4fa.zip
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>
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r--arch/mips/bcm63xx/dev-flash.c6
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) {