mirror of https://github.com/hak5/openwrt.git
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
|
From 01034e48e72783ced82a050e862f82ee3dfdb783 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
Date: Mon, 21 Nov 2011 00:48:52 +0100
|
||
|
|
Subject: [PATCH 7/7] MIPS: BCM63XX: add flash detection for BCM6362
|
||
|
|
|
||
|
|
BCM6362 support booting from SPI flash and NAND.
|
||
|
|
|
||
|
|
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
---
|
||
|
|
arch/mips/bcm63xx/dev-flash.c | 6 ++++++
|
||
|
|
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 1 +
|
||
|
|
2 files changed, 7 insertions(+)
|
||
|
|
|
||
|
|
--- a/arch/mips/bcm63xx/dev-flash.c
|
||
|
|
+++ b/arch/mips/bcm63xx/dev-flash.c
|
||
|
|
@@ -77,6 +77,12 @@ static int __init bcm63xx_detect_flash_t
|
||
|
|
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) {
|
||
|
|
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
|
||
|
|
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
|
||
|
|
@@ -1372,6 +1372,7 @@
|
||
|
|
|
||
|
|
#define MISC_STRAPBUS_6362_REG 0x14
|
||
|
|
#define STRAPBUS_6362_FCVO_SHIFT 1
|
||
|
|
+#define STRAPBUS_6362_HSSPI_CLK_FAST (1 << 13)
|
||
|
|
#define STRAPBUS_6362_FCVO_MASK (0x1f << STRAPBUS_6362_FCVO_SHIFT)
|
||
|
|
#define STRAPBUS_6362_BOOT_SEL_SERIAL (1 << 15)
|
||
|
|
#define STRAPBUS_6362_BOOT_SEL_NAND (0 << 15)
|