bcm63xx: update patches to latest upstream versions

[openwrt.git] / target / linux / brcm63xx / patches-3.3 / 427-MTD-m25p80-allow-passing-pp_data.patch

diff --git a/target/linux/brcm63xx/patches-3.3/427-MTD-m25p80-allow-passing-pp_data.patch b/target/linux/brcm63xx/patches-3.3/427-MTD-m25p80-allow-passing-pp_data.patch
index 51836f5..6e5cdbe 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/427-MTD-m25p80-allow-passing-pp_data.patch
+++ b/target/linux/brcm63xx/patches-3.3/427-MTD-m25p80-allow-passing-pp_data.patch
@@ -1,16 +1,16 @@
-From 087a67d5750a51f5b0851228b5b2518f3300f7d8 Mon Sep 17 00:00:00 2001
+From f888824d352df894ab721a5ca067b0313500efe7 Mon Sep 17 00:00:00 2001
 From: Jonas Gorski <jonas.gorski@gmail.com>
 Date: Thu, 3 May 2012 12:17:54 +0200
-Subject: [PATCH 65/79] MIPS: BCM63XX: store the flash type in global variable
+Subject: [PATCH 38/59] MIPS: BCM63XX: store the flash type in global variable
 
 ---
- arch/mips/bcm63xx/dev-flash.c                      |   36 +++++++++++++-------
- .../include/asm/mach-bcm63xx/bcm63xx_dev_flash.h   |    2 ++
+ arch/mips/bcm63xx/dev-flash.c                      |   36 +++++++++++++------
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_flash.h   |    2 +
  2 files changed, 26 insertions(+), 12 deletions(-)
 
 --- a/arch/mips/bcm63xx/dev-flash.c
 +++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -24,6 +24,8 @@
+@@ -25,6 +25,8 @@
  #include <bcm63xx_regs.h>
  #include <bcm63xx_io.h>
  
@@ -19,9 +19,9 @@ Subject: [PATCH 65/79] MIPS: BCM63XX: store the flash type in global variable
  static struct mtd_partition mtd_partitions[] = {
        {
                .name           = "cfe",
-@@ -81,20 +83,23 @@ static int __init bcm63xx_detect_flash_t
-               bcm63xx_spi_flash_info[0].max_speed_hz = 40000000;
-               val = bcm_misc_readl(MISC_STRAPBUS_6328_REG);
+@@ -86,20 +88,23 @@ static int __init bcm63xx_detect_flash_t
+                       bcm63xx_spi_flash_info[0].max_speed_hz = 16666667;
+ 
                if (val & STRAPBUS_6328_BOOT_SEL_SERIAL)
 -                      return BCM63XX_FLASH_TYPE_SERIAL;
 +                      bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL;
@@ -48,7 +48,7 @@ Subject: [PATCH 65/79] MIPS: BCM63XX: store the flash type in global variable
        case BCM6368_CPU_ID:
                val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
                if (val & STRAPBUS_6368_SPI_CLK_FAST)
-@@ -102,25 +107,32 @@ static int __init bcm63xx_detect_flash_t
+@@ -107,25 +112,32 @@ static int __init bcm63xx_detect_flash_t
  
                switch (val & STRAPBUS_6368_BOOT_SEL_MASK) {
                case STRAPBUS_6368_BOOT_SEL_NAND:
@@ -87,10 +87,10 @@ Subject: [PATCH 65/79] MIPS: BCM63XX: store the flash type in global variable
        case BCM63XX_FLASH_TYPE_PARALLEL:
                /* read base address of boot chip select (0) */
                val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-@@ -141,7 +153,7 @@ int __init bcm63xx_flash_register(void)
+@@ -146,7 +158,7 @@ int __init bcm63xx_flash_register(void)
                return -ENODEV;
        default:
-               pr_err("flash detection failed for BCM%x: %d",
+               pr_err("flash detection failed for BCM%x: %d\n",
 -                     bcm63xx_get_cpu_id(), flash_type);
 +                     bcm63xx_get_cpu_id(), bcm63xx_attached_flash);
                return -ENODEV;