--- /dev/null
+From b620329db3d6646a172a599b0e960baca081fff1 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sat, 12 Nov 2011 11:17:32 +0100
+Subject: [PATCH 25/79] MIPS: BCM63XX: move flash registration out of
+ board_bcm963xx.c
+
+board_bcm963xx.c is already large enough.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/Makefile | 4 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 49 +-------------
+ arch/mips/bcm63xx/dev-flash.c | 68 ++++++++++++++++++++
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_flash.h | 6 ++
+ 4 files changed, 78 insertions(+), 49 deletions(-)
+ create mode 100644 arch/mips/bcm63xx/dev-flash.c
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
+
+--- a/arch/mips/bcm63xx/Makefile
++++ b/arch/mips/bcm63xx/Makefile
+@@ -1,6 +1,6 @@
+ obj-y += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
+- dev-dsp.o dev-enet.o dev-pcmcia.o dev-spi.o dev-trng.o \
+- dev-uart.o dev-wdt.o
++ dev-dsp.o dev-enet.o dev-flash.o dev-pcmcia.o dev-spi.o \
++ dev-trng.o dev-uart.o dev-wdt.o
+ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+
+ obj-y += boards/
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -11,9 +11,6 @@
+ #include <linux/kernel.h>
+ #include <linux/string.h>
+ #include <linux/platform_device.h>
+-#include <linux/mtd/mtd.h>
+-#include <linux/mtd/partitions.h>
+-#include <linux/mtd/physmap.h>
+ #include <linux/ssb/ssb.h>
+ #include <linux/gpio_keys.h>
+ #include <linux/input.h>
+@@ -26,6 +23,7 @@
+ #include <bcm63xx_dev_pci.h>
+ #include <bcm63xx_dev_enet.h>
+ #include <bcm63xx_dev_dsp.h>
++#include <bcm63xx_dev_flash.h>
+ #include <bcm63xx_dev_pcmcia.h>
+ #include <bcm63xx_dev_spi.h>
+ #include <board_bcm963xx.h>
+@@ -865,40 +863,6 @@ void __init board_setup(void)
+ panic("unexpected CPU for bcm963xx board");
+ }
+
+-static struct mtd_partition mtd_partitions[] = {
+- {
+- .name = "cfe",
+- .offset = 0x0,
+- .size = 0x40000,
+- }
+-};
+-
+-static const char *bcm63xx_part_types[] = { "bcm63xxpart", NULL };
+-
+-static struct physmap_flash_data flash_data = {
+- .width = 2,
+- .nr_parts = ARRAY_SIZE(mtd_partitions),
+- .parts = mtd_partitions,
+- .part_probe_types = bcm63xx_part_types,
+-};
+-
+-static struct resource mtd_resources[] = {
+- {
+- .start = 0, /* filled at runtime */
+- .end = 0, /* filled at runtime */
+- .flags = IORESOURCE_MEM,
+- }
+-};
+-
+-static struct platform_device mtd_dev = {
+- .name = "physmap-flash",
+- .resource = mtd_resources,
+- .num_resources = ARRAY_SIZE(mtd_resources),
+- .dev = {
+- .platform_data = &flash_data,
+- },
+-};
+-
+ static struct gpio_led_platform_data bcm63xx_led_data;
+
+ static struct platform_device bcm63xx_gpio_leds = {
+@@ -922,7 +886,6 @@ static struct platform_device bcm63xx_gp
+ */
+ int __init board_register_devices(void)
+ {
+- u32 val;
+ int button_count = 0;
+ int led_count = 0;
+
+@@ -967,14 +930,7 @@ int __init board_register_devices(void)
+ if (board.num_spis)
+ spi_register_board_info(board.spis, board.num_spis);
+
+- /* read base address of boot chip select (0) */
+- val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+- val &= MPI_CSBASE_BASE_MASK;
+-
+- mtd_resources[0].start = val;
+- mtd_resources[0].end = 0x1FFFFFFF;
+-
+- platform_device_register(&mtd_dev);
++ bcm63xx_flash_register();
+
+ /* count number of LEDs defined by this device */
+ while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name)
+--- /dev/null
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -0,0 +1,68 @@
++/*
++ * Broadcom BCM63xx flash registration
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2009 Florian Fainelli <florian@openwrt.org>
++ */
++
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/platform_device.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/partitions.h>
++#include <linux/mtd/physmap.h>
++
++#include <bcm63xx_cpu.h>
++#include <bcm63xx_dev_flash.h>
++#include <bcm63xx_regs.h>
++#include <bcm63xx_io.h>
++
++static struct mtd_partition mtd_partitions[] = {
++ {
++ .name = "cfe",
++ .offset = 0x0,
++ .size = 0x40000,
++ }
++};
++
++static const char *bcm63xx_part_types[] = { "bcm63xxpart", NULL };
++
++static struct physmap_flash_data flash_data = {
++ .width = 2,
++ .parts = mtd_partitions,
++ .part_probe_types = bcm63xx_part_types,
++};
++
++static struct resource mtd_resources[] = {
++ {
++ .start = 0, /* filled at runtime */
++ .end = 0, /* filled at runtime */
++ .flags = IORESOURCE_MEM,
++ }
++};
++
++static struct platform_device mtd_dev = {
++ .name = "physmap-flash",
++ .resource = mtd_resources,
++ .num_resources = ARRAY_SIZE(mtd_resources),
++ .dev = {
++ .platform_data = &flash_data,
++ },
++};
++
++int __init bcm63xx_flash_register(void)
++{
++ u32 val;
++
++ /* read base address of boot chip select (0) */
++ val = bcm_mpi_readl(MPI_CSBASE_REG(0));
++ val &= MPI_CSBASE_BASE_MASK;
++
++ mtd_resources[0].start = val;
++ mtd_resources[0].end = 0x1FFFFFFF;
++
++ return platform_device_register(&mtd_dev);
++}
+--- /dev/null
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
+@@ -0,0 +1,6 @@
++#ifndef __BCM63XX_FLASH_H
++#define __BCM63XX_FLASH_H
++
++int __init bcm63xx_flash_register(void);
++
++#endif /* __BCM63XX_FLASH_H */
--- /dev/null
+From 0b2451b1cdab390b0b86c60a4765208bb2724d22 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Sat, 2 Jul 2011 14:44:28 +0200
+Subject: [PATCH 26/79] MIPS: BCM63XX: add flash type detection
+
+On BCM6358 and BCM6368 the attached flash type is exposed through a
+bootstrapping register. Use it for auto detecting the flash type on
+those and default to parallel flash for earlier SoCs.
+
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+---
+ arch/mips/bcm63xx/dev-flash.c | 60 ++++++++++++++++++--
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_flash.h | 6 ++
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 9 +++
+ 3 files changed, 69 insertions(+), 6 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -6,6 +6,7 @@
+ * for more details.
+ *
+ * Copyright (C) 2009 Florian Fainelli <florian@openwrt.org>
++ * Copyright (C) 2012 Jonas Gorski <jonas.gorski@gmail.com>
+ */
+
+ #include <linux/init.h>
+@@ -53,16 +54,63 @@ static struct platform_device mtd_dev =
+ },
+ };
+
+-int __init bcm63xx_flash_register(void)
++static int __init bcm63xx_detect_flash_type(void)
+ {
+ u32 val;
+
+- /* read base address of boot chip select (0) */
+- val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+- val &= MPI_CSBASE_BASE_MASK;
++ switch (bcm63xx_get_cpu_id()) {
++ case BCM6338_CPU_ID:
++ case BCM6345_CPU_ID:
++ case BCM6348_CPU_ID:
++ /* no way to auto detect so assume parallel */
++ return BCM63XX_FLASH_TYPE_PARALLEL;
++ case BCM6358_CPU_ID:
++ val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
++ if (val & STRAPBUS_6358_BOOT_SEL_PARALLEL)
++ return BCM63XX_FLASH_TYPE_PARALLEL;
++ else
++ return BCM63XX_FLASH_TYPE_SERIAL;
++ case BCM6368_CPU_ID:
++ val = bcm_gpio_readl(GPIO_STRAPBUS_REG);
++ switch (val & STRAPBUS_6368_BOOT_SEL_MASK) {
++ case STRAPBUS_6368_BOOT_SEL_NAND:
++ return BCM63XX_FLASH_TYPE_NAND;
++ case STRAPBUS_6368_BOOT_SEL_SERIAL:
++ return BCM63XX_FLASH_TYPE_SERIAL;
++ case STRAPBUS_6368_BOOT_SEL_PARALLEL:
++ return BCM63XX_FLASH_TYPE_PARALLEL;
++ }
++ default:
++ return -EINVAL;
++ }
++}
++
++int __init bcm63xx_flash_register(void)
++{
++ int flash_type;
++ u32 val;
+
+- mtd_resources[0].start = val;
+- mtd_resources[0].end = 0x1FFFFFFF;
++ flash_type = bcm63xx_detect_flash_type();
+
+- return platform_device_register(&mtd_dev);
++ switch (flash_type) {
++ case BCM63XX_FLASH_TYPE_PARALLEL:
++ /* read base address of boot chip select (0) */
++ val = bcm_mpi_readl(MPI_CSBASE_REG(0));
++ val &= MPI_CSBASE_BASE_MASK;
++
++ mtd_resources[0].start = val;
++ mtd_resources[0].end = 0x1FFFFFFF;
++
++ return platform_device_register(&mtd_dev);
++ case BCM63XX_FLASH_TYPE_SERIAL:
++ pr_warn("unsupported serial flash detected\n");
++ return -ENODEV;
++ case BCM63XX_FLASH_TYPE_NAND:
++ pr_warn("unsupported NAND flash detected\n");
++ return -ENODEV;
++ default:
++ pr_err("flash detection failed for BCM%x: %d",
++ bcm63xx_get_cpu_id(), flash_type);
++ return -ENODEV;
++ }
+ }
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
+@@ -1,6 +1,12 @@
+ #ifndef __BCM63XX_FLASH_H
+ #define __BCM63XX_FLASH_H
+
++enum {
++ BCM63XX_FLASH_TYPE_PARALLEL,
++ BCM63XX_FLASH_TYPE_SERIAL,
++ BCM63XX_FLASH_TYPE_NAND,
++};
++
+ int __init bcm63xx_flash_register(void);
+
+ #endif /* __BCM63XX_FLASH_H */
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+@@ -508,6 +508,15 @@
+ #define GPIO_BASEMODE_6368_MASK 0x7
+ /* those bits must be kept as read in gpio basemode register*/
+
++#define GPIO_STRAPBUS_REG 0x40
++#define STRAPBUS_6358_BOOT_SEL_PARALLEL (1 << 1)
++#define STRAPBUS_6358_BOOT_SEL_SERIAL (0 << 1)
++#define STRAPBUS_6368_BOOT_SEL_MASK 0x3
++#define STRAPBUS_6368_BOOT_SEL_NAND 0
++#define STRAPBUS_6368_BOOT_SEL_SERIAL 1
++#define STRAPBUS_6368_BOOT_SEL_PARALLEL 3
++
++
+ /*************************************************************************
+ * _REG relative to RSET_ENET
+ *************************************************************************/
+++ b/arch/mips/bcm63xx/Makefile
@@ -1,6 +1,6 @@
obj-y += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
- dev-dsp.o dev-enet.o dev-pcmcia.o dev-spi.o dev-trng.o \
-- dev-uart.o dev-wdt.o
-+ dev-uart.o dev-usb-ohci.o dev-wdt.o
+ dev-dsp.o dev-enet.o dev-flash.o dev-pcmcia.o dev-spi.o \
+- dev-trng.o dev-uart.o dev-wdt.o
++ dev-trng.o dev-uart.o dev-usb-ohci.o dev-wdt.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-y += boards/
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -28,6 +28,7 @@
- #include <bcm63xx_dev_dsp.h>
+@@ -26,6 +26,7 @@
+ #include <bcm63xx_dev_flash.h>
#include <bcm63xx_dev_pcmcia.h>
#include <bcm63xx_dev_spi.h>
+#include <bcm63xx_dev_usb_ohci.h>
#include <board_bcm963xx.h>
#include <bcm_tag.h>
-@@ -943,6 +944,9 @@ int __init board_register_devices(void)
+@@ -906,6 +907,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr))
bcm63xx_enet_register(1, &board.enet1);
+++ b/arch/mips/bcm63xx/Makefile
@@ -1,6 +1,6 @@
obj-y += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \
- dev-dsp.o dev-enet.o dev-pcmcia.o dev-spi.o dev-trng.o \
-- dev-uart.o dev-usb-ohci.o dev-wdt.o
-+ dev-uart.o dev-usb-ehci.o dev-usb-ohci.o dev-wdt.o
+ dev-dsp.o dev-enet.o dev-flash.o dev-pcmcia.o dev-spi.o \
+- dev-trng.o dev-uart.o dev-usb-ohci.o dev-wdt.o
++ dev-trng.o dev-uart.o dev-usb-ehci.o dev-usb-ohci.o dev-wdt.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-y += boards/
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -29,6 +29,7 @@
+@@ -27,6 +27,7 @@
#include <bcm63xx_dev_pcmcia.h>
#include <bcm63xx_dev_spi.h>
#include <bcm63xx_dev_usb_ohci.h>
#include <board_bcm963xx.h>
#include <bcm_tag.h>
-@@ -944,6 +945,9 @@ int __init board_register_devices(void)
+@@ -907,6 +908,9 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr))
bcm63xx_enet_register(1, &board.enet1);
drivers/mtd/redboot.c | 13 +++++++++--
3 files changed, 38 insertions(+), 26 deletions(-)
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -875,7 +875,7 @@ static struct mtd_partition mtd_partitio
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -29,7 +29,7 @@ static struct mtd_partition mtd_partitio
}
};
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -847,6 +847,8 @@ void __init board_prom_init(void)
+@@ -845,6 +845,8 @@ void __init board_prom_init(void)
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G3_EXT_MII |
GPIO_MODE_6348_G0_EXT_MII;
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -947,6 +947,10 @@ int __init board_register_devices(void)
+@@ -910,6 +910,10 @@ int __init board_register_devices(void)
!board_get_mac_address(board.enet1.mac_addr))
bcm63xx_enet_register(1, &board.enet1);
#endif /* ! BCM63XX_DEV_ENET_H_ */
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -699,10 +699,60 @@
+@@ -708,10 +708,60 @@
* _REG relative to RSET_ENETSW
*************************************************************************/
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -132,6 +132,55 @@ static struct board_info __initdata boar
+@@ -130,6 +130,55 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -640,6 +689,7 @@ static const struct board_info __initdat
+@@ -638,6 +687,7 @@ static const struct board_info __initdat
&board_DV201AMR,
&board_96348gw_a,
&board_rta1025w_16,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -17,6 +17,9 @@
+@@ -14,6 +14,9 @@
#include <linux/ssb/ssb.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
-@@ -41,6 +44,12 @@
+@@ -39,6 +42,12 @@
#define CFE_OFFSET_64K 0x10000
#define CFE_OFFSET_128K 0x20000
static struct bcm963xx_nvram nvram;
static unsigned int mac_addr_used;
static struct board_info board;
-@@ -667,6 +676,496 @@ static struct board_info __initdata boar
+@@ -665,6 +674,496 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
#endif
/*
-@@ -697,9 +1196,30 @@ static const struct board_info __initdat
+@@ -695,9 +1194,30 @@ static const struct board_info __initdat
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
/*
* Register a sane SPROMv2 to make the on-board
* bcm4318 WLAN work
-@@ -850,6 +1370,9 @@ void __init board_prom_init(void)
+@@ -848,6 +1368,9 @@ void __init board_prom_init(void)
boardid_fixup(boot_addr);
}
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -202,6 +202,38 @@ static struct board_info __initdata boar
+@@ -200,6 +200,38 @@ static struct board_info __initdata boar
.has_uart0 = 1,
};
#endif
/*
-@@ -1175,6 +1207,7 @@ static const struct board_info __initdat
+@@ -1173,6 +1205,7 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
&board_96338w,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -665,6 +665,98 @@ static struct board_info __initdata boar
+@@ -663,6 +663,98 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_AGPFS0 = {
.name = "AGPF-S0",
.expected_cpu_id = 0x6358,
-@@ -1228,6 +1320,7 @@ static const struct board_info __initdat
+@@ -1226,6 +1318,7 @@ static const struct board_info __initdat
&board_96358vw,
&board_96358vw2,
&board_AGPFS0,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -801,6 +801,59 @@ static struct board_info __initdata boar
+@@ -799,6 +799,59 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
struct spi_gpio_platform_data nb4_spi_gpio_data = {
.sck = NB4_SPI_GPIO_CLK,
.mosi = NB4_SPI_GPIO_MOSI,
-@@ -1322,6 +1375,7 @@ static const struct board_info __initdat
+@@ -1320,6 +1373,7 @@ static const struct board_info __initdat
&board_AGPFS0,
&board_CPVA642,
&board_DWVS0,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -190,6 +190,67 @@ static struct board_info __initdata boar
+@@ -188,6 +188,67 @@ static struct board_info __initdata boar
},
};
#endif
/*
-@@ -1367,6 +1428,7 @@ static const struct board_info __initdat
+@@ -1365,6 +1426,7 @@ static const struct board_info __initdat
&board_96348gw_a,
&board_rta1025w_16,
&board_96348_D4PW,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -537,6 +537,112 @@ static struct board_info __initdata boar
+@@ -535,6 +535,112 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
.expected_cpu_id = 0x6348,
-@@ -1421,6 +1527,8 @@ static const struct board_info __initdat
+@@ -1419,6 +1525,8 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
&board_96348gw,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -251,6 +251,76 @@ static struct board_info __initdata boar
+@@ -249,6 +249,76 @@ static struct board_info __initdata boar
},
};
#endif
/*
-@@ -1537,6 +1607,7 @@ static const struct board_info __initdat
+@@ -1535,6 +1605,7 @@ static const struct board_info __initdat
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1580,6 +1580,81 @@ static struct board_info __initdata boar
+@@ -1578,6 +1578,81 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
#endif
/*
-@@ -1622,6 +1697,7 @@ static const struct board_info __initdat
+@@ -1620,6 +1695,7 @@ static const struct board_info __initdat
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -365,6 +365,43 @@ static struct board_info __initdata boar
+@@ -363,6 +363,43 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -1665,6 +1702,7 @@ static const struct board_info __initdat
+@@ -1663,6 +1700,7 @@ static const struct board_info __initdat
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1692,6 +1692,72 @@ static struct board_info __initdata boar
+@@ -1690,6 +1690,72 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -1736,6 +1802,7 @@ static const struct board_info __initdat
+@@ -1734,6 +1800,7 @@ static const struct board_info __initdat
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -321,6 +321,63 @@ static struct board_info __initdata boar
+@@ -319,6 +319,63 @@ static struct board_info __initdata boar
},
};
#endif
/*
-@@ -1787,6 +1844,7 @@ static const struct board_info __initdat
+@@ -1785,6 +1842,7 @@ static const struct board_info __initdat
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1940,6 +1998,22 @@ void __init board_prom_init(void)
+@@ -1938,6 +1996,22 @@ void __init board_prom_init(void)
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;
boot_addr = (u8 *)KSEG1ADDR(val);
/* dump cfe version */
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2160,6 +2234,13 @@ int __init board_register_devices(void)
- val = bcm_mpi_readl(MPI_CSBASE_REG(0));
- val &= MPI_CSBASE_BASE_MASK;
+--- a/arch/mips/bcm63xx/dev-flash.c
++++ b/arch/mips/bcm63xx/dev-flash.c
+@@ -16,6 +16,7 @@
+ #include <linux/mtd/partitions.h>
+ #include <linux/mtd/physmap.h>
-+ /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks */
-+ /* Loading from CFE always uses Bank 0 */
-+ if (!strcmp(board.name, "V2500V_BB")) {
-+ printk(KERN_INFO PFX "V2500V: Start in Bank 0\n");
-+ val = val + 0x400000; // Select Bank 0 start address
-+ }
++#include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+ #include <bcm63xx_dev_flash.h>
+ #include <bcm63xx_regs.h>
+@@ -98,6 +99,13 @@ int __init bcm63xx_flash_register(void)
+ val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+ val &= MPI_CSBASE_BASE_MASK;
+
++ /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks */
++ /* Loading from CFE always uses Bank 0 */
++ if (!strcmp(board_get_name(), "V2500V_BB")) {
++ pr_info("V2500V: Start in Bank 0\n");
++ val = val + 0x400000; // Select Bank 0 start address
++ }
+
- mtd_resources[0].start = val;
- mtd_resources[0].end = 0x1FFFFFFF;
+ mtd_resources[0].start = val;
+ mtd_resources[0].end = 0x1FFFFFFF;
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -633,6 +633,62 @@ static struct board_info __initdata boar
+@@ -631,6 +631,62 @@ static struct board_info __initdata boar
},
};
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -1845,6 +1901,7 @@ static const struct board_info __initdat
+@@ -1843,6 +1899,7 @@ static const struct board_info __initdat
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -689,6 +689,49 @@ static struct board_info __initdata boar
+@@ -687,6 +687,49 @@ static struct board_info __initdata boar
};
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -1902,6 +1945,7 @@ static const struct board_info __initdat
+@@ -1900,6 +1943,7 @@ static const struct board_info __initdat
&board_96348sv,
&board_V2500V_BB,
&board_V2110,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1214,6 +1214,8 @@ static struct board_info __initdata boar
+@@ -1212,6 +1212,8 @@ static struct board_info __initdata boar
.name = "DWV-S0",
.expected_cpu_id = 0x6358,
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
-@@ -1229,6 +1231,7 @@ static struct board_info __initdata boar
+@@ -1227,6 +1229,7 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -378,6 +378,67 @@ static struct board_info __initdata boar
+@@ -376,6 +376,67 @@ static struct board_info __initdata boar
},
};
#endif
/*
-@@ -1949,6 +2010,7 @@ static const struct board_info __initdat
+@@ -1947,6 +2008,7 @@ static const struct board_info __initdat
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -995,6 +995,7 @@ static struct board_info __initdata boar
+@@ -993,6 +993,7 @@ static struct board_info __initdata boar
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -439,6 +439,42 @@ static struct board_info __initdata boar
+@@ -437,6 +437,42 @@ static struct board_info __initdata boar
},
};
#endif
/*
-@@ -2012,6 +2048,7 @@ static const struct board_info __initdat
+@@ -2010,6 +2046,7 @@ static const struct board_info __initdat
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2018,6 +2018,80 @@ static struct board_info __initdata boar
+@@ -2016,6 +2016,80 @@ static struct board_info __initdata boar
#endif
/*
* all boards
*/
static const struct board_info __initdata *bcm963xx_boards[] = {
-@@ -2066,6 +2140,10 @@ static const struct board_info __initdat
+@@ -2064,6 +2138,10 @@ static const struct board_info __initdat
&board_HW553,
&board_spw303v,
#endif
};
static void __init nb4_nvram_fixup(void)
-@@ -2282,12 +2360,25 @@ void __init board_prom_init(void)
+@@ -2280,12 +2358,25 @@ void __init board_prom_init(void)
if (board.has_pci) {
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G2_PCI;
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2089,6 +2089,72 @@ static struct board_info __initdata boar
+@@ -2087,6 +2087,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
#endif
/*
-@@ -2143,6 +2209,7 @@ static const struct board_info __initdat
+@@ -2141,6 +2207,7 @@ static const struct board_info __initdat
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1306,6 +1306,99 @@ static struct board_info __initdata boar
+@@ -1304,6 +1304,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1086,6 +1086,19 @@ static struct board_info __initdata boar
+@@ -1084,6 +1084,19 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -664,6 +664,17 @@ static struct board_info __initdata boar
+@@ -662,6 +662,17 @@ static struct board_info __initdata boar
.active_low = 1,
},
},
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -17,6 +17,7 @@
+@@ -14,6 +14,7 @@
#include <linux/ssb/ssb.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
#include <linux/spi/74x164.h>
-@@ -55,6 +56,13 @@ static unsigned int mac_addr_used;
+@@ -53,6 +54,13 @@ static unsigned int mac_addr_used;
static struct board_info board;
/*
* known 6338 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6338
-@@ -2492,6 +2500,7 @@ void __init board_prom_init(void)
+@@ -2490,6 +2498,7 @@ void __init board_prom_init(void)
/* extract nvram data */
memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2359,7 +2359,7 @@ static void __init nb4_nvram_fixup(void)
+@@ -2357,7 +2357,7 @@ static void __init nb4_nvram_fixup(void)
* bcm4318 WLAN work
*/
#ifdef CONFIG_SSB_PCIHOST
.revision = 0x02,
.board_rev = 0x17,
.country_code = 0x0,
-@@ -2379,6 +2379,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -2377,6 +2377,7 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848,
.boardflags_hi = 0x0000,
};
projects / openwrt / staging / noltari.git / commitdiff