brcm63xx: register serial through device tree

[openwrt/openwrt.git] / target / linux / brcm63xx / patches-4.4 / 411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch

diff --git a/target/linux/brcm63xx/patches-4.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/brcm63xx/patches-4.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
index 6dab40d7e10947120d294c885ebe8d0aa67d179d..608ad8e39a4ca0c141c567ffa63130a7ee115314 100644 (file)
--- a/target/linux/brcm63xx/patches-4.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
+++ b/target/linux/brcm63xx/patches-4.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch
@@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 
 --- 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>
@@ -21,11 +21,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  
  #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;
  }
  
@@ -67,7 +63,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  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 */
@@ -83,7 +79,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                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);
@@ -104,7 +100,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                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);
@@ -116,7 +112,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
                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)
  {
@@ -124,7 +120,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        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: