diff options
author | Jonas Gorski <jogo@openwrt.org> | 2013-04-23 13:55:36 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2013-04-23 13:55:36 +0000 |
commit | 90986b5581772a3767f5af2cadbde7310a3df296 (patch) | |
tree | 5a83f720d472bd1e039b021f92b9ff552d16cbe2 /target/linux/brcm63xx/patches-3.8/028-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch | |
parent | 2a1a16d2d55b02dd145db1be84999b88895595e5 (diff) | |
download | upstream-90986b5581772a3767f5af2cadbde7310a3df296.tar.gz upstream-90986b5581772a3767f5af2cadbde7310a3df296.tar.bz2 upstream-90986b5581772a3767f5af2cadbde7310a3df296.zip |
bcm63xx: update patches with upstream submissions
SVN-Revision: 36407
Diffstat (limited to 'target/linux/brcm63xx/patches-3.8/028-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.8/028-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/028-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch b/target/linux/brcm63xx/patches-3.8/028-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch new file mode 100644 index 0000000000..38125a50e9 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.8/028-MIPS-BCM63XX-add-flash-detection-for-BCM6362.patch @@ -0,0 +1,38 @@ +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) |