Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab8ed982 authored by Jonas Gorski's avatar Jonas Gorski Committed by Ralf Baechle
Browse files

MIPS: BCM63XX: add flash detection for BCM6362 



BCM6362 support booting from SPI flash and NAND.

Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5012/


Acked-by: default avatarJohn Crispin <blogic@openwrt.org>
parent a156ba61

arch/mips/bcm63xx/dev-flash.c

+6 −0
Original line number Diff line number Diff line
@@ -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) {

arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -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)