--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -17,9 +17,13 @@
+@@ -17,6 +17,9 @@
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/spi-nor.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
+@@ -66,6 +69,41 @@ void __init bcm63xx_flash_force_phys_bas
mtd_resources[0].end = end;
}
static int __init bcm63xx_detect_flash_type(void)
{
u32 val;
-@@ -73,9 +112,15 @@ static int __init bcm63xx_detect_flash_t
+@@ -73,9 +111,15 @@ static int __init bcm63xx_detect_flash_t
switch (bcm63xx_get_cpu_id()) {
case BCM6318_CPU_ID:
/* only support serial flash */
if (val & STRAPBUS_6328_BOOT_SEL_SERIAL)
return BCM63XX_FLASH_TYPE_SERIAL;
else
-@@ -94,12 +139,20 @@ static int __init bcm63xx_detect_flash_t
+@@ -94,12 +138,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);
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
+@@ -110,6 +162,11 @@ static int __init bcm63xx_detect_flash_t
}
case BCM63268_CPU_ID:
val = bcm_misc_readl(MISC_STRAPBUS_63268_REG);
if (val & STRAPBUS_63268_BOOT_SEL_SERIAL)
return BCM63XX_FLASH_TYPE_SERIAL;
else
-@@ -176,6 +234,7 @@ void __init bcm63xx_flash_detect(void)
+@@ -176,6 +233,7 @@ void __init bcm63xx_flash_detect(void)
int __init bcm63xx_flash_register(void)
{
u32 val;
switch (flash_type) {
-@@ -195,8 +254,14 @@ int __init bcm63xx_flash_register(void)
+@@ -195,8 +253,14 @@ int __init bcm63xx_flash_register(void)
return platform_device_register(&mtd_dev);
case BCM63XX_FLASH_TYPE_SERIAL: