CC: brcm63xx: ensure dummy byte is set for mapped spi flash with fast read

[15.05/openwrt.git] / target / linux / brcm63xx / patches-3.18 / 511-board_V2500V.patch

diff --git a/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
index 99a684e..5b7c789 100644 (file)
--- a/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -760,6 +760,27 @@ static struct board_info __initdata boar
-               },
+@@ -720,6 +720,27 @@ static struct board_info __initdata boar
+               .ext_irq                = 2,
        },
  };
 +
@@ -28,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -1084,6 +1105,7 @@ static const struct board_info __initcon
+@@ -1052,6 +1073,7 @@ static const struct board_info __initcon
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -36,7 +36,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1122,6 +1144,7 @@ static struct of_device_id const bcm963x
+@@ -1091,6 +1113,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
        { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
        { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
@@ -44,7 +44,7 @@
        { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
        { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
        { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
-@@ -1181,6 +1204,22 @@ void __init board_bcm963xx_init(void)
+@@ -1150,6 +1173,22 @@ void __init board_bcm963xx_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);
@@ -69,7 +69,7 @@
        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
 --- a/arch/mips/bcm63xx/dev-flash.c
 +++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -19,6 +19,7 @@
+@@ -20,6 +20,7 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/flash.h>
  
@@ -77,7 +77,7 @@
  #include <bcm63xx_cpu.h>
  #include <bcm63xx_dev_flash.h>
  #include <bcm63xx_dev_hsspi.h>
-@@ -220,6 +221,13 @@ int __init bcm63xx_flash_register(int nu
+@@ -234,6 +235,13 @@ int __init bcm63xx_flash_register(int nu
                        val = bcm_mpi_readl(MPI_CSBASE_REG(0));
                        val &= MPI_CSBASE_BASE_MASK;