You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
161 lines
4.8 KiB
161 lines
4.8 KiB
From d135d94b3d1fe599d13e7198d5f502912d694c13 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
|
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 <jonas.gorski@gmail.com>
|
|
---
|
|
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,9 +17,13 @@
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/mtd/physmap.h>
|
|
#include <linux/mtd/spi-nor.h>
|
|
+#include <linux/of.h>
|
|
+#include <linux/spi/spi.h>
|
|
+#include <linux/spi/flash.h>
|
|
|
|
#include <bcm63xx_cpu.h>
|
|
#include <bcm63xx_dev_flash.h>
|
|
+#include <bcm63xx_dev_hsspi.h>
|
|
#include <bcm63xx_regs.h>
|
|
#include <bcm63xx_io.h>
|
|
|
|
@@ -66,6 +70,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 +112,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,12 +139,20 @@ 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 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;
|
|
@@ -110,6 +163,11 @@ static int __init bcm63xx_detect_flash_t
|
|
}
|
|
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
|
|
@@ -176,6 +234,7 @@ void __init bcm63xx_flash_detect(void)
|
|
|
|
int __init bcm63xx_flash_register(void)
|
|
{
|
|
+ struct device_node *np;
|
|
u32 val;
|
|
|
|
switch (flash_type) {
|
|
@@ -195,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
|
|
@@ -708,6 +708,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
|
|
@@ -1564,6 +1565,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 << 28)
|
|
|