From d135d94b3d1fe599d13e7198d5f502912d694c13 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sun, 3 Jul 2011 15:00:38 +0200 Subject: [PATCH 29/60] MIPS: BCM63XX: Register SPI flash if present Signed-off-by: Jonas Gorski --- arch/mips/bcm63xx/dev-flash.c | 35 +++++++++++++++++++- arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 2 + 2 files changed, 33 insertions(+), 2 deletions(-) --- a/arch/mips/bcm63xx/dev-flash.c +++ b/arch/mips/bcm63xx/dev-flash.c @@ -17,6 +17,9 @@ #include #include #include +#include +#include +#include #include #include @@ -66,6 +69,41 @@ void __init bcm63xx_flash_force_phys_bas mtd_resources[0].end = end; } +static struct spi_board_info bcm63xx_spi_flash_info[] = { + { + .bus_num = 0, + .chip_select = 0, + .mode = 0, + .max_speed_hz = 781000, + .modalias = "m25p80", + }, +}; + +static void bcm63xx_of_update_spi_flash_speed(struct device_node *np, + unsigned int new_hz) +{ + struct property *max_hz; + __be32 *hz; + + max_hz = kzalloc(sizeof(*max_hz) + sizeof(*hz), GFP_KERNEL); + if (!max_hz) + return; + + max_hz->name = kstrdup("spi-max-frequency", GFP_KERNEL); + if (!max_hz->name) { + kfree(max_hz); + return; + } + + max_hz->value = max_hz + 1; + max_hz->length = sizeof(*hz); + + hz = max_hz->value; + *hz = cpu_to_be32(new_hz); + + of_update_property(np, max_hz); +} + static int __init bcm63xx_detect_flash_type(void) { u32 val; @@ -73,9 +111,15 @@ static int __init bcm63xx_detect_flash_t switch (bcm63xx_get_cpu_id()) { case BCM6318_CPU_ID: /* only support serial flash */ + bcm63xx_spi_flash_info[0].max_speed_hz = 62500000; return BCM63XX_FLASH_TYPE_SERIAL; case BCM6328_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_6328_REG); + if (val & STRAPBUS_6328_HSSPI_CLK_FAST) + bcm63xx_spi_flash_info[0].max_speed_hz = 33333334; + else + bcm63xx_spi_flash_info[0].max_speed_hz = 16666667; + if (val & STRAPBUS_6328_BOOT_SEL_SERIAL) return BCM63XX_FLASH_TYPE_SERIAL; else @@ -94,18 +138,31 @@ static int __init bcm63xx_detect_flash_t return BCM63XX_FLASH_TYPE_SERIAL; case BCM6362_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_6362_REG); + if (val & STRAPBUS_6362_HSSPI_CLK_FAST) + bcm63xx_spi_flash_info[0].max_speed_hz = 50000000; + else + bcm63xx_spi_flash_info[0].max_speed_hz = 20000000; + if (val & STRAPBUS_6362_BOOT_SEL_SERIAL) return BCM63XX_FLASH_TYPE_SERIAL; else return BCM63XX_FLASH_TYPE_NAND; case BCM63268_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_63268_REG); + if (val & STRAPBUS_63268_HSSPI_CLK_FAST) + bcm63xx_spi_flash_info[0].max_speed_hz = 50000000; + else + bcm63xx_spi_flash_info[0].max_speed_hz = 20000000; + if (val & STRAPBUS_63268_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); + if (val & STRAPBUS_6368_SPI_CLK_FAST) + bcm63xx_spi_flash_info[0].max_speed_hz = 20000000; + switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { case STRAPBUS_6368_BOOT_SEL_NAND: return BCM63XX_FLASH_TYPE_NAND; @@ -177,6 +234,7 @@ void __init bcm63xx_flash_detect(void) int __init bcm63xx_flash_register(void) { + struct device_node *np; u32 val; switch (flash_type) { @@ -196,8 +254,14 @@ int __init bcm63xx_flash_register(void) return platform_device_register(&mtd_dev); case BCM63XX_FLASH_TYPE_SERIAL: - pr_warn("unsupported serial flash detected\n"); - return -ENODEV; + np = of_find_compatible_node(NULL, NULL, "jedec,spi-nor"); + if (np) { + bcm63xx_of_update_spi_flash_speed(np, bcm63xx_spi_flash_info[0].max_speed_hz); + of_node_put(np); + return 0; + } else { + return -ENODEV; + } case BCM63XX_FLASH_TYPE_NAND: pr_warn("unsupported NAND flash detected\n"); return -ENODEV; --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h @@ -709,6 +709,7 @@ #define GPIO_STRAPBUS_REG 0x40 #define STRAPBUS_6358_BOOT_SEL_PARALLEL (1 << 1) #define STRAPBUS_6358_BOOT_SEL_SERIAL (0 << 1) +#define STRAPBUS_6368_SPI_CLK_FAST (1 << 6) #define STRAPBUS_6368_BOOT_SEL_MASK 0x3 #define STRAPBUS_6368_BOOT_SEL_NAND 0 #define STRAPBUS_6368_BOOT_SEL_SERIAL 1 @@ -1570,6 +1571,7 @@ #define IDDQ_CTRL_63268_USBH (1 << 4) #define MISC_STRAPBUS_6328_REG 0x240 +#define STRAPBUS_6328_HSSPI_CLK_FAST (1 << 4) #define STRAPBUS_6328_FCVO_SHIFT 7 #define STRAPBUS_6328_FCVO_MASK (0x1f << STRAPBUS_6328_FCVO_SHIFT) #define STRAPBUS_6328_BOOT_SEL_SERIAL (1 << 18)