brcm63xx: fixup patches borked by allowing too much fuzz

Move defines and board_info structs back to their proper locations so
(de-)selecting SOC support won't break the build.

Reported-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 41550
This commit is contained in:
Jonas Gorski 2014-07-08 12:27:55 +00:00
parent a6c4ef18b7
commit 8630d101b7
82 changed files with 210 additions and 222 deletions

View file

@ -20,7 +20,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -647,7 +647,7 @@ static inline u32 hc32_to_cpup (const st
@@ -649,7 +649,7 @@ static inline u32 hc32_to_cpup (const st
* some big-endian SOC implementations. Same thing happens with PSW access.
*/

View file

@ -8,16 +8,16 @@
#define PFX "board_bcm963xx: "
@@ -339,6 +340,9 @@ static struct board_info __initdata boar
.force_duplex_full = 1,
},
@@ -31,6 +32,9 @@
#define BCM963XX_KEYS_POLL_INTERVAL 20
#define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3)
+#define CFE_OFFSET_64K 0x10000
+#define CFE_OFFSET_128K 0x20000
+
.has_ohci0 = 1,
.has_pccard = 1,
/*
* known 3368 boards
*/
@@ -722,6 +726,30 @@ static const struct board_info __initcon
#endif
};

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -131,28 +131,28 @@ static struct board_info __initdata boar
@@ -134,28 +134,28 @@ static struct board_info __initdata boar
.leds = {
{
@ -34,7 +34,7 @@
.gpio = 1,
.active_low = 1,
}
@@ -172,28 +172,28 @@ static struct board_info __initdata boar
@@ -175,28 +175,28 @@ static struct board_info __initdata boar
.leds = {
{
@ -68,7 +68,7 @@
.gpio = 1,
.active_low = 1,
},
@@ -232,29 +232,29 @@ static struct board_info __initdata boar
@@ -235,29 +235,29 @@ static struct board_info __initdata boar
.leds = {
{
@ -103,7 +103,7 @@
.gpio = 1,
.active_low = 1,
},
@@ -293,28 +293,28 @@ static struct board_info __initdata boar
@@ -296,28 +296,28 @@ static struct board_info __initdata boar
.leds = {
{

View file

@ -1,19 +1,17 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -12,6 +12,12 @@
@@ -12,6 +12,10 @@
#include <linux/string.h>
#include <linux/gpio_keys.h>
#include <linux/input.h>
+#include <linux/platform_device.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/spi_gpio.h>
+#if 0 /* FIXME: 3.14 removed non-DT support */
+#include <linux/spi/74x164.h>
+#endif
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
@@ -343,6 +349,12 @@ static struct board_info __initdata boar
@@ -35,6 +39,12 @@
#define CFE_OFFSET_64K 0x10000
#define CFE_OFFSET_128K 0x20000
@ -23,10 +21,10 @@
+#define NB4_SPI_GPIO_CLK 6
+#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
+
.has_ohci0 = 1,
.has_pccard = 1,
@@ -739,6 +751,605 @@ static struct board_info __initdata boar
/*
* known 3368 boards
*/
@@ -739,6 +749,601 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@ -51,14 +49,11 @@
+ &nb4_spi_gpio,
+};
+
+#if 0 /* FIXME: 3.14 removed non-DT support */
+const struct gen_74x164_chip_platform_data nb4_74x164_platform_data = {
+ .base = NB4_74X164_GPIO_BASE
+};
+#endif
+
+static struct spi_board_info nb4_spi_devices[] = {
+#if 0 /* FIXME: 3.14 removed non-DT support */
+ {
+ .modalias = "74x164",
+ .max_speed_hz = 781000,
@ -67,7 +62,6 @@
+ .mode = SPI_MODE_0,
+ .platform_data = &nb4_74x164_platform_data
+ }
+#endif
+};
+
+static struct board_info __initdata board_nb4_ser_r0 = {
@ -632,7 +626,7 @@
#endif
/*
@@ -775,6 +1386,11 @@ static const struct board_info __initcon
@@ -775,6 +1380,11 @@ static const struct board_info __initcon
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
@ -644,7 +638,7 @@
#endif
};
@@ -783,6 +1399,16 @@ static void __init boardid_fixup(u8 *boo
@@ -783,6 +1393,16 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name();

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -205,6 +205,40 @@ static struct board_info __initdata boar
@@ -212,6 +212,40 @@ static struct board_info __initdata boar
},
},
};
@ -41,7 +41,7 @@
#endif
/*
@@ -1365,6 +1399,7 @@ static const struct board_info __initcon
@@ -1359,6 +1393,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
&board_96338w,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -742,6 +742,98 @@ static struct board_info __initdata boar
@@ -740,6 +740,98 @@ static struct board_info __initdata boar
},
};
@ -99,7 +99,7 @@
static struct board_info __initdata board_AGPFS0 = {
.name = "AGPF-S0",
.expected_cpu_id = 0x6358,
@@ -1420,6 +1512,7 @@ static const struct board_info __initcon
@@ -1414,6 +1506,7 @@ static const struct board_info __initcon
&board_96358vw,
&board_96358vw2,
&board_AGPFS0,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -878,6 +878,61 @@ static struct board_info __initdata boar
@@ -876,6 +876,61 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@ -62,7 +62,7 @@
struct spi_gpio_platform_data nb4_spi_gpio_data = {
.sck = NB4_SPI_GPIO_CLK,
.mosi = NB4_SPI_GPIO_MOSI,
@@ -1514,6 +1569,7 @@ static const struct board_info __initcon
@@ -1508,6 +1563,7 @@ static const struct board_info __initcon
&board_AGPFS0,
&board_CPVA642,
&board_DWVS0,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -635,6 +635,67 @@ static struct board_info __initdata boar
@@ -633,6 +633,67 @@ static struct board_info __initdata boar
},
},
};
@ -68,7 +68,7 @@
#endif
/*
@@ -1561,6 +1622,7 @@ static const struct board_info __initcon
@@ -1555,6 +1616,7 @@ static const struct board_info __initcon
&board_96348gw_a,
&board_rta1025w_16,
&board_96348_D4PW,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -502,6 +502,112 @@ static struct board_info __initdata boar
@@ -500,6 +500,112 @@ static struct board_info __initdata boar
},
};
@ -113,7 +113,7 @@
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
.expected_cpu_id = 0x6348,
@@ -1615,6 +1721,8 @@ static const struct board_info __initcon
@@ -1609,6 +1715,8 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
&board_96348gw,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -802,6 +802,78 @@ static struct board_info __initdata boar
@@ -800,6 +800,78 @@ static struct board_info __initdata boar
},
},
};
@ -79,7 +79,7 @@
#endif
/*
@@ -1731,6 +1803,7 @@ static const struct board_info __initcon
@@ -1725,6 +1797,7 @@ static const struct board_info __initcon
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1770,6 +1770,83 @@ static struct board_info __initdata boar
@@ -1764,6 +1764,83 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@ -84,7 +84,7 @@
#endif
/*
@@ -1818,6 +1895,7 @@ static const struct board_info __initcon
@@ -1812,6 +1889,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -239,6 +239,45 @@ static struct board_info __initdata boar
@@ -246,6 +246,45 @@ static struct board_info __initdata boar
},
},
};
@ -46,7 +46,7 @@
#endif
/*
@@ -1863,6 +1902,7 @@ static const struct board_info __initcon
@@ -1857,6 +1896,7 @@ static const struct board_info __initcon
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1886,6 +1886,72 @@ static struct board_info __initdata boar
@@ -1880,6 +1880,72 @@ static struct board_info __initdata boar
},
},
};
@ -73,7 +73,7 @@
#endif
/*
@@ -1936,6 +2002,7 @@ static const struct board_info __initcon
@@ -1930,6 +1996,7 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -913,6 +913,65 @@ static struct board_info __initdata boar
@@ -911,6 +911,65 @@ static struct board_info __initdata boar
},
},
};
@ -66,7 +66,7 @@
#endif
/*
@@ -1987,6 +2046,7 @@ static const struct board_info __initcon
@@ -1981,6 +2040,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
@ -74,7 +74,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
@@ -2062,6 +2122,22 @@ void __init board_bcm963xx_init(void)
@@ -2056,6 +2116,22 @@ void __init board_bcm963xx_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -473,6 +473,64 @@ static struct board_info __initdata boar
@@ -471,6 +471,64 @@ static struct board_info __initdata boar
},
};
@ -65,7 +65,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
@@ -2047,6 +2105,7 @@ static const struct board_info __initcon
@@ -2041,6 +2099,7 @@ static const struct board_info __initcon
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -531,6 +531,51 @@ static struct board_info __initdata boar
@@ -529,6 +529,51 @@ static struct board_info __initdata boar
};
@ -52,7 +52,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
@@ -2106,6 +2151,7 @@ static const struct board_info __initcon
@@ -2100,6 +2145,7 @@ static const struct board_info __initcon
&board_96348sv,
&board_V2500V_BB,
&board_V2110,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1301,6 +1301,8 @@ static struct board_info __initdata boar
@@ -1299,6 +1299,8 @@ static struct board_info __initdata boar
.name = "DWV-S0",
.expected_cpu_id = 0x6358,
@ -9,7 +9,7 @@
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
@@ -1316,6 +1318,7 @@ static struct board_info __initdata boar
@@ -1314,6 +1316,7 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -576,6 +576,69 @@ static struct board_info __initdata boar
@@ -574,6 +574,69 @@ static struct board_info __initdata boar
},
};
@ -70,7 +70,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
@@ -2155,6 +2218,7 @@ static const struct board_info __initcon
@@ -2149,6 +2212,7 @@ static const struct board_info __initcon
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -841,6 +841,7 @@ static struct board_info __initdata boar
@@ -839,6 +839,7 @@ static struct board_info __initdata boar
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1139,6 +1139,42 @@ static struct board_info __initdata boar
@@ -1137,6 +1137,42 @@ static struct board_info __initdata boar
},
},
};
@ -43,7 +43,7 @@
#endif
/*
@@ -2220,6 +2256,7 @@ static const struct board_info __initcon
@@ -2214,6 +2250,7 @@ static const struct board_info __initcon
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,

View file

@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2220,6 +2220,85 @@ static struct board_info __initdata boar
@@ -2214,6 +2214,85 @@ static struct board_info __initdata boar
#endif
/*
@ -96,7 +96,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
@@ -2274,6 +2353,10 @@ static const struct board_info __initcon
@@ -2268,6 +2347,10 @@ static const struct board_info __initcon
&board_HW553,
&board_spw303v,
#endif

View file

@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2296,6 +2296,72 @@ static struct board_info __initdata boar
@@ -2290,6 +2290,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@ -82,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
#endif
/*
@@ -2356,6 +2422,7 @@ static const struct board_info __initcon
@@ -2350,6 +2416,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,

View file

@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -87,13 +87,45 @@ static struct board_info __initdata boar
@@ -94,13 +94,45 @@ static struct board_info __initdata boar
.port_no = 0,
},
@ -56,7 +56,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
.name = "96328avng::power",
.gpio = 4,
.active_low = 1,
@@ -110,7 +142,7 @@ static struct board_info __initdata boar
@@ -117,7 +149,7 @@ static struct board_info __initdata boar
.active_low = 1,
},
{

View file

@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -148,6 +148,76 @@ static struct board_info __initdata boar
@@ -155,6 +155,76 @@ static struct board_info __initdata boar
},
},
};
@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
#endif
/*
@@ -2405,6 +2475,7 @@ static const struct board_info __initcon
@@ -2399,6 +2469,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,

View file

@ -10,7 +10,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -218,6 +218,111 @@ static struct board_info __initdata boar
@@ -225,6 +225,111 @@ static struct board_info __initdata boar
},
};
@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
#endif
/*
@@ -2476,6 +2581,7 @@ static const struct board_info __initcon
@@ -2470,6 +2575,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1382,6 +1382,59 @@ static struct board_info __initdata boar
@@ -1380,6 +1380,59 @@ static struct board_info __initdata boar
.ephy_reset_gpio_flags = GPIOF_INIT_HIGH,
};
@ -60,7 +60,7 @@
#endif
/*
@@ -2611,6 +2664,7 @@ static const struct board_info __initcon
@@ -2605,6 +2658,7 @@ static const struct board_info __initcon
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -635,6 +635,13 @@ static struct board_info __initdata boar
@@ -45,6 +45,12 @@
#define NB4_SPI_GPIO_CLK 6
#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
@ -10,11 +10,10 @@
+#define CT6373_SPI_GPIO_CLK 6
+#define CT6373_74HC64_GPIO(X) (CT6373_74X164_GPIO_BASE + (X))
+
+
.has_ohci0 = 1,
.has_pccard = 1,
@@ -2335,6 +2342,117 @@ static struct board_info __initdata boar
/*
* known 3368 boards
*/
@@ -2329,6 +2335,113 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@ -38,14 +37,11 @@
+ &ct6373_spi_gpio,
+};
+
+#if 0 /* FIXME: 3.14 dropped non-DT support */
+const struct gen_74x164_chip_platform_data ct6373_74x164_platform_data = {
+ .base = CT6373_74X164_GPIO_BASE
+};
+#endif
+
+static struct spi_board_info ct6373_spi_devices[] = {
+#if 0 /* FIXME: 3.14 dropped non-DT support */
+ {
+ .modalias = "74x164",
+ .max_speed_hz = 781000,
@ -54,7 +50,6 @@
+ .mode = SPI_MODE_0,
+ .platform_data = &ct6373_74x164_platform_data
+ }
+#endif
+};
+
+static struct board_info __initdata board_ct6373_1 = {
@ -132,7 +127,7 @@
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
@@ -2679,6 +2797,7 @@ static const struct board_info __initcon
@@ -2673,6 +2786,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2595,6 +2595,73 @@ static struct board_info __initdata boar
@@ -2584,6 +2584,73 @@ static struct board_info __initdata boar
},
}
};
@ -74,7 +74,7 @@
#endif
/*
@@ -2800,6 +2867,7 @@ static const struct board_info __initcon
@@ -2789,6 +2856,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,

View file

@ -1,14 +1,14 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -18,6 +18,7 @@
#if 0 /* FIXME: 3.14 removed non-DT support */
@@ -16,6 +16,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
#include <linux/spi/74x164.h>
#endif
+#include <linux/rtl8367.h>
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
@@ -634,6 +635,8 @@ static struct board_info __initdata boar
@@ -44,6 +45,8 @@
#define NB4_SPI_GPIO_MOSI 7
#define NB4_SPI_GPIO_CLK 6
#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
@ -17,7 +17,7 @@
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
@@ -2664,6 +2667,104 @@ static struct board_info __initdata boar
@@ -2653,6 +2656,104 @@ static struct board_info __initdata boar
};
#endif
@ -122,7 +122,7 @@
/*
* known 6368 boards
*/
@@ -2870,6 +2971,10 @@ static const struct board_info __initcon
@@ -2859,6 +2960,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
@ -133,7 +133,7 @@
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
@@ -2891,6 +2996,11 @@ static void __init boardid_fixup(u8 *boo
@@ -2880,6 +2985,11 @@ static void __init boardid_fixup(u8 *boo
}
}

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1054,6 +1054,57 @@ static struct board_info __initdata boar
@@ -1051,6 +1051,57 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
@ -58,7 +58,7 @@
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
@@ -2939,6 +2990,7 @@ static const struct board_info __initcon
@@ -2928,6 +2979,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -220,6 +220,126 @@ static struct board_info __initdata boar
@@ -235,6 +235,126 @@ static struct board_info __initdata boar
},
};
@ -127,7 +127,7 @@
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
@@ -2971,6 +3091,7 @@ static const struct board_info __initcon
@@ -2960,6 +3080,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -150,6 +150,79 @@ static struct board_info __initdata boar
@@ -165,6 +165,79 @@ static struct board_info __initdata boar
},
};
@ -80,7 +80,7 @@
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
@@ -3090,6 +3163,7 @@ static const struct board_info __initcon
@@ -3079,6 +3152,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -150,6 +150,73 @@ static struct board_info __initdata boar
@@ -165,6 +165,73 @@ static struct board_info __initdata boar
},
};
@ -74,7 +74,7 @@
static struct board_info __initdata board_96328A_1441N1 = {
.name = "96328A-1441N1",
.expected_cpu_id = 0x6328,
@@ -3163,6 +3230,7 @@ static const struct board_info __initcon
@@ -3152,6 +3219,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -758,6 +758,55 @@ static struct board_info __initdata boar
@@ -773,6 +773,55 @@ static struct board_info __initdata boar
.has_uart0 = 1,
};
@ -56,7 +56,7 @@
#endif
/*
@@ -3244,6 +3293,7 @@ static const struct board_info __initcon
@@ -3233,6 +3282,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,

View file

@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
@@ -2893,6 +2894,492 @@ static struct board_info __initdata boar
@@ -2882,6 +2883,492 @@ static struct board_info __initdata boar
},
};
@ -501,7 +501,7 @@
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
@@ -3332,6 +3819,10 @@ static const struct board_info __initcon
@@ -3321,6 +3808,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2,
&board_ct6373_1,
&board_HW553,
@ -512,7 +512,7 @@
&board_spw303v,
&board_DVAG3810BN,
#endif
@@ -3351,13 +3842,37 @@ static void __init boardid_fixup(u8 *boo
@@ -3340,13 +3831,37 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name();

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -747,6 +747,60 @@ static struct board_info __initdata boar
@@ -823,6 +823,60 @@ static struct board_info __initdata boar
},
},
};
@ -61,7 +61,7 @@
#endif
/*
@@ -3781,6 +3835,7 @@ static const struct board_info __initcon
@@ -3770,6 +3824,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,

View file

@ -12,7 +12,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1469,6 +1469,122 @@ static struct board_info __initdata boar
@@ -1466,6 +1466,122 @@ static struct board_info __initdata boar
},
};
@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
@@ -3825,6 +3941,7 @@ static const struct board_info __initcon
@@ -3814,6 +3930,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_963281T_TEF,
&board_dsl_274xb_f1,

View file

@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -3780,6 +3780,96 @@ static struct board_info __initdata boar
@@ -3769,6 +3769,96 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
@ -103,7 +103,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
#endif
/*
@@ -4001,6 +4091,7 @@ static const struct board_info __initcon
@@ -3990,6 +4080,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2196,6 +2196,99 @@ static struct board_info __initdata boar
@@ -2193,6 +2193,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1644,6 +1644,19 @@ static struct board_info __initdata boar
@@ -1641,6 +1641,19 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -970,6 +970,17 @@ static struct board_info __initdata boar
@@ -985,6 +985,17 @@ static struct board_info __initdata boar
.active_low = 1,
},
},

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -598,6 +598,8 @@ static struct board_info __initdata boar
@@ -613,6 +613,8 @@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_enet0 = 1,
.enet0 = {
@ -9,7 +9,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -641,6 +643,8 @@ static struct board_info __initdata boar
@@ -656,6 +658,8 @@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_enet0 = 1,
.enet0 = {
@ -18,7 +18,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -926,6 +930,8 @@ static struct board_info __initdata boar
@@ -941,6 +945,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -27,7 +27,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -998,6 +1004,8 @@ static struct board_info __initdata boar
@@ -1013,6 +1019,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -36,7 +36,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1245,6 +1253,8 @@ static struct board_info __initdata boar
@@ -1242,6 +1250,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -45,7 +45,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1420,6 +1430,8 @@ static struct board_info __initdata boar
@@ -1417,6 +1427,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -54,7 +54,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1610,6 +1622,8 @@ static struct board_info __initdata boar
@@ -1607,6 +1619,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -63,7 +63,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1631,6 +1645,8 @@ static struct board_info __initdata boar
@@ -1628,6 +1642,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -72,7 +72,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1650,6 +1666,8 @@ static struct board_info __initdata boar
@@ -1647,6 +1663,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -81,7 +81,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2021,6 +2039,8 @@ static struct board_info __initdata boar
@@ -2018,6 +2036,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -90,7 +90,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2073,6 +2093,8 @@ static struct board_info __initdata boar
@@ -2070,6 +2090,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -99,7 +99,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2214,6 +2236,8 @@ static struct board_info __initdata boar
@@ -2211,6 +2233,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -108,7 +108,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2331,6 +2355,8 @@ static struct board_info __initdata boar
@@ -2328,6 +2352,8 @@ static struct board_info __initdata boar
},
.enet1 = {

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2363,6 +2363,94 @@ static struct board_info __initdata boar
@@ -2360,6 +2360,94 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -73,6 +73,93 @@ static struct board_info __initdata boar
@@ -88,6 +88,93 @@ static struct board_info __initdata boar
#endif
/*
@ -94,7 +94,7 @@
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
@@ -4255,6 +4342,9 @@ static const struct board_info __initcon
@@ -4244,6 +4331,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -157,6 +157,94 @@ static struct board_info __initdata boar
@@ -172,6 +172,94 @@ static struct board_info __initdata boar
},
},
};
@ -95,7 +95,7 @@
#endif
/*
@@ -4344,6 +4432,7 @@ static const struct board_info __initcon
@@ -4333,6 +4421,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4424,6 +4424,75 @@ static struct board_info __initdata boar
@@ -4413,6 +4413,75 @@ static struct board_info __initdata boar
#endif
/*
@ -76,7 +76,7 @@
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
@@ -4508,6 +4577,9 @@ static const struct board_info __initcon
@@ -4497,6 +4566,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif

View file

@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2193,6 +2193,51 @@ static struct board_info __initdata boar
@@ -2190,6 +2190,51 @@ static struct board_info __initdata boar
},
};
@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
#endif
/*
@@ -4544,6 +4589,7 @@ static const struct board_info __initcon
@@ -4533,6 +4578,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4535,6 +4535,108 @@ static struct board_info __initdata boar
@@ -4524,6 +4524,108 @@ static struct board_info __initdata boar
},
},
};
@ -109,7 +109,7 @@
#endif
/*
@@ -4625,6 +4727,7 @@ static const struct board_info __initcon
@@ -4614,6 +4716,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4472,6 +4472,131 @@ static struct board_info __initdata boar
@@ -4461,6 +4461,131 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
@ -132,7 +132,7 @@
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
@@ -4726,6 +4851,7 @@ static const struct board_info __initcon
@@ -4715,6 +4840,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268

View file

@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
@@ -4466,6 +4467,99 @@ static struct board_info __initdata boar
@@ -4455,6 +4456,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@ -108,7 +108,7 @@
#endif
/*
@@ -4849,6 +4943,7 @@ static const struct board_info __initcon
@@ -4838,6 +4932,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,

View file

@ -8,16 +8,16 @@
#define PFX "board_bcm963xx: "
@@ -339,6 +340,9 @@ static struct board_info __initdata boar
.force_duplex_full = 1,
},
@@ -31,6 +32,9 @@
#define BCM963XX_KEYS_POLL_INTERVAL 20
#define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3)
+#define CFE_OFFSET_64K 0x10000
+#define CFE_OFFSET_128K 0x20000
+
.has_ohci0 = 1,
.has_pccard = 1,
/*
* known 3368 boards
*/
@@ -722,6 +726,30 @@ static const struct board_info __initcon
#endif
};

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -131,28 +131,28 @@ static struct board_info __initdata boar
@@ -134,28 +134,28 @@ static struct board_info __initdata boar
.leds = {
{
@ -34,7 +34,7 @@
.gpio = 1,
.active_low = 1,
}
@@ -172,28 +172,28 @@ static struct board_info __initdata boar
@@ -175,28 +175,28 @@ static struct board_info __initdata boar
.leds = {
{
@ -68,7 +68,7 @@
.gpio = 1,
.active_low = 1,
},
@@ -232,29 +232,29 @@ static struct board_info __initdata boar
@@ -235,29 +235,29 @@ static struct board_info __initdata boar
.leds = {
{
@ -103,7 +103,7 @@
.gpio = 1,
.active_low = 1,
},
@@ -293,28 +293,28 @@ static struct board_info __initdata boar
@@ -296,28 +296,28 @@ static struct board_info __initdata boar
.leds = {
{

View file

@ -13,7 +13,7 @@
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
@@ -343,6 +349,12 @@ static struct board_info __initdata boar
@@ -35,6 +41,12 @@
#define CFE_OFFSET_64K 0x10000
#define CFE_OFFSET_128K 0x20000
@ -23,9 +23,9 @@
+#define NB4_SPI_GPIO_CLK 6
+#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
+
.has_ohci0 = 1,
.has_pccard = 1,
/*
* known 3368 boards
*/
@@ -739,6 +751,605 @@ static struct board_info __initdata boar
.has_ohci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -205,6 +205,40 @@ static struct board_info __initdata boar
@@ -214,6 +214,40 @@ static struct board_info __initdata boar
},
},
};

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -239,6 +239,45 @@ static struct board_info __initdata boar
@@ -248,6 +248,45 @@ static struct board_info __initdata boar
},
},
};

View file

@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -87,13 +87,45 @@ static struct board_info __initdata boar
@@ -96,13 +96,45 @@ static struct board_info __initdata boar
.port_no = 0,
},
@ -56,7 +56,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
.name = "96328avng::power",
.gpio = 4,
.active_low = 1,
@@ -110,7 +142,7 @@ static struct board_info __initdata boar
@@ -119,7 +151,7 @@ static struct board_info __initdata boar
.active_low = 1,
},
{

View file

@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -148,6 +148,76 @@ static struct board_info __initdata boar
@@ -157,6 +157,76 @@ static struct board_info __initdata boar
},
},
};

View file

@ -10,7 +10,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -218,6 +218,111 @@ static struct board_info __initdata boar
@@ -227,6 +227,111 @@ static struct board_info __initdata boar
},
};

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -635,6 +635,13 @@ static struct board_info __initdata boar
@@ -47,6 +47,12 @@
#define NB4_SPI_GPIO_CLK 6
#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
@ -10,11 +10,10 @@
+#define CT6373_SPI_GPIO_CLK 6
+#define CT6373_74HC64_GPIO(X) (CT6373_74X164_GPIO_BASE + (X))
+
+
.has_ohci0 = 1,
.has_pccard = 1,
@@ -2335,6 +2342,117 @@ static struct board_info __initdata boar
/*
* known 3368 boards
*/
@@ -2335,6 +2341,117 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@ -132,7 +131,7 @@
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
@@ -2679,6 +2797,7 @@ static const struct board_info __initcon
@@ -2679,6 +2796,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2595,6 +2595,73 @@ static struct board_info __initdata boar
@@ -2594,6 +2594,73 @@ static struct board_info __initdata boar
},
}
};
@ -74,7 +74,7 @@
#endif
/*
@@ -2800,6 +2867,7 @@ static const struct board_info __initcon
@@ -2799,6 +2866,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,

View file

@ -8,7 +8,7 @@
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
@@ -634,6 +635,8 @@ static struct board_info __initdata boar
@@ -46,6 +47,8 @@
#define NB4_SPI_GPIO_MOSI 7
#define NB4_SPI_GPIO_CLK 6
#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
@ -17,7 +17,7 @@
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
@@ -2664,6 +2667,104 @@ static struct board_info __initdata boar
@@ -2663,6 +2666,104 @@ static struct board_info __initdata boar
};
#endif
@ -122,7 +122,7 @@
/*
* known 6368 boards
*/
@@ -2870,6 +2971,10 @@ static const struct board_info __initcon
@@ -2869,6 +2970,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
@ -133,7 +133,7 @@
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
@@ -2891,6 +2996,11 @@ static void __init boardid_fixup(u8 *boo
@@ -2890,6 +2995,11 @@ static void __init boardid_fixup(u8 *boo
}
}

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1054,6 +1054,57 @@ static struct board_info __initdata boar
@@ -1053,6 +1053,57 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
@ -58,7 +58,7 @@
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
@@ -2939,6 +2990,7 @@ static const struct board_info __initcon
@@ -2938,6 +2989,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -220,6 +220,126 @@ static struct board_info __initdata boar
@@ -237,6 +237,126 @@ static struct board_info __initdata boar
},
};
@ -127,7 +127,7 @@
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
@@ -2971,6 +3091,7 @@ static const struct board_info __initcon
@@ -2970,6 +3090,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -150,6 +150,79 @@ static struct board_info __initdata boar
@@ -167,6 +167,79 @@ static struct board_info __initdata boar
},
};
@ -80,7 +80,7 @@
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
@@ -3090,6 +3163,7 @@ static const struct board_info __initcon
@@ -3089,6 +3162,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -150,6 +150,73 @@ static struct board_info __initdata boar
@@ -167,6 +167,73 @@ static struct board_info __initdata boar
},
};
@ -74,7 +74,7 @@
static struct board_info __initdata board_96328A_1441N1 = {
.name = "96328A-1441N1",
.expected_cpu_id = 0x6328,
@@ -3163,6 +3230,7 @@ static const struct board_info __initcon
@@ -3162,6 +3229,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -758,6 +758,55 @@ static struct board_info __initdata boar
@@ -775,6 +775,55 @@ static struct board_info __initdata boar
.has_uart0 = 1,
};
@ -56,7 +56,7 @@
#endif
/*
@@ -3244,6 +3293,7 @@ static const struct board_info __initcon
@@ -3243,6 +3292,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,

View file

@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
@@ -2893,6 +2894,492 @@ static struct board_info __initdata boar
@@ -2892,6 +2893,492 @@ static struct board_info __initdata boar
},
};
@ -501,7 +501,7 @@
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
@@ -3332,6 +3819,10 @@ static const struct board_info __initcon
@@ -3331,6 +3818,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2,
&board_ct6373_1,
&board_HW553,
@ -512,7 +512,7 @@
&board_spw303v,
&board_DVAG3810BN,
#endif
@@ -3351,13 +3842,37 @@ static void __init boardid_fixup(u8 *boo
@@ -3350,13 +3841,37 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name();

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -808,6 +808,60 @@ static struct board_info __initdata boar
@@ -825,6 +825,60 @@ static struct board_info __initdata boar
},
},
};
@ -61,7 +61,7 @@
#endif
/*
@@ -3781,6 +3835,7 @@ static const struct board_info __initcon
@@ -3780,6 +3834,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,

View file

@ -12,7 +12,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1469,6 +1469,122 @@ static struct board_info __initdata boar
@@ -1468,6 +1468,122 @@ static struct board_info __initdata boar
},
};
@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
@@ -3825,6 +3941,7 @@ static const struct board_info __initcon
@@ -3824,6 +3940,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_963281T_TEF,
&board_dsl_274xb_f1,

View file

@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -3780,6 +3780,96 @@ static struct board_info __initdata boar
@@ -3779,6 +3779,96 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
@ -103,7 +103,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
#endif
/*
@@ -4001,6 +4091,7 @@ static const struct board_info __initcon
@@ -4000,6 +4090,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2196,6 +2196,99 @@ static struct board_info __initdata boar
@@ -2195,6 +2195,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1644,6 +1644,19 @@ static struct board_info __initdata boar
@@ -1643,6 +1643,19 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -970,6 +970,17 @@ static struct board_info __initdata boar
@@ -987,6 +987,17 @@ static struct board_info __initdata boar
.active_low = 1,
},
},

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -598,6 +598,8 @@ static struct board_info __initdata boar
@@ -615,6 +615,8 @@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_enet0 = 1,
.enet0 = {
@ -9,7 +9,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -641,6 +643,8 @@ static struct board_info __initdata boar
@@ -658,6 +660,8 @@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_enet0 = 1,
.enet0 = {
@ -18,7 +18,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -926,6 +930,8 @@ static struct board_info __initdata boar
@@ -943,6 +947,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -27,7 +27,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -998,6 +1004,8 @@ static struct board_info __initdata boar
@@ -1015,6 +1021,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -36,7 +36,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1245,6 +1253,8 @@ static struct board_info __initdata boar
@@ -1244,6 +1252,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -45,7 +45,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1420,6 +1430,8 @@ static struct board_info __initdata boar
@@ -1419,6 +1429,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -54,7 +54,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1610,6 +1622,8 @@ static struct board_info __initdata boar
@@ -1609,6 +1621,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -63,7 +63,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1631,6 +1645,8 @@ static struct board_info __initdata boar
@@ -1630,6 +1644,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -72,7 +72,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1650,6 +1666,8 @@ static struct board_info __initdata boar
@@ -1649,6 +1665,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -81,7 +81,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2021,6 +2039,8 @@ static struct board_info __initdata boar
@@ -2020,6 +2038,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -90,7 +90,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2073,6 +2093,8 @@ static struct board_info __initdata boar
@@ -2072,6 +2092,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -99,7 +99,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2214,6 +2236,8 @@ static struct board_info __initdata boar
@@ -2213,6 +2235,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -108,7 +108,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2331,6 +2355,8 @@ static struct board_info __initdata boar
@@ -2330,6 +2354,8 @@ static struct board_info __initdata boar
},
.enet1 = {

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2363,6 +2363,94 @@ static struct board_info __initdata boar
@@ -2362,6 +2362,94 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -73,6 +73,93 @@ static struct board_info __initdata boar
@@ -90,6 +90,93 @@ static struct board_info __initdata boar
#endif
/*
@ -94,7 +94,7 @@
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
@@ -4255,6 +4342,9 @@ static const struct board_info __initcon
@@ -4254,6 +4341,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -157,6 +157,94 @@ static struct board_info __initdata boar
@@ -174,6 +174,94 @@ static struct board_info __initdata boar
},
},
};
@ -95,7 +95,7 @@
#endif
/*
@@ -4344,6 +4432,7 @@ static const struct board_info __initcon
@@ -4343,6 +4431,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4424,6 +4424,75 @@ static struct board_info __initdata boar
@@ -4423,6 +4423,75 @@ static struct board_info __initdata boar
#endif
/*
@ -76,7 +76,7 @@
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
@@ -4508,6 +4577,9 @@ static const struct board_info __initcon
@@ -4507,6 +4576,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif

View file

@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2193,6 +2193,51 @@ static struct board_info __initdata boar
@@ -2192,6 +2192,51 @@ static struct board_info __initdata boar
},
};
@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
#endif
/*
@@ -4544,6 +4589,7 @@ static const struct board_info __initcon
@@ -4543,6 +4588,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4535,6 +4535,108 @@ static struct board_info __initdata boar
@@ -4534,6 +4534,108 @@ static struct board_info __initdata boar
},
},
};
@ -109,7 +109,7 @@
#endif
/*
@@ -4625,6 +4727,7 @@ static const struct board_info __initcon
@@ -4624,6 +4726,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4472,6 +4472,131 @@ static struct board_info __initdata boar
@@ -4471,6 +4471,131 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
@ -132,7 +132,7 @@
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
@@ -4726,6 +4851,7 @@ static const struct board_info __initcon
@@ -4725,6 +4850,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268

View file

@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
@@ -4466,6 +4467,99 @@ static struct board_info __initdata boar
@@ -4465,6 +4466,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@ -108,7 +108,7 @@
#endif
/*
@@ -4849,6 +4943,7 @@ static const struct board_info __initcon
@@ -4848,6 +4942,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,