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

32 files changed, 82 insertions, 83 deletions

diff --git a/target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch
index 33744fd..a206aba 100644
--- a/target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch
@@ -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
  };
diff --git a/target/linux/brcm63xx/patches-3.14/308-board_leds_naming.patch b/target/linux/brcm63xx/patches-3.14/308-board_leds_naming.patch
index fe46755..0bf8a6a 100644
--- a/target/linux/brcm63xx/patches-3.14/308-board_leds_naming.patch
+++ b/target/linux/brcm63xx/patches-3.14/308-board_leds_naming.patch
@@ -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 = {
  		{
diff --git a/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch
index ca32c79..10baa3f 100644
--- a/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch
index 3a2c160..fd47881 100644
--- a/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch
@@ -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
  		},
  	},
  };
diff --git a/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch
index 01812c6..db68d0d 100644
--- a/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch
@@ -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
  		},
  	},
  };
diff --git a/target/linux/brcm63xx/patches-3.14/522-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/brcm63xx/patches-3.14/522-MIPS-BCM63XX-add-96328avng-reference-board.patch
index 6e2b920..721e872 100644
--- a/target/linux/brcm63xx/patches-3.14/522-MIPS-BCM63XX-add-96328avng-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/522-MIPS-BCM63XX-add-96328avng-reference-board.patch
@@ -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,
  		},
  		{
diff --git a/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index 0ab119e..9137ebc 100644
--- a/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -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
  		},
  	},
  };
diff --git a/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch
index ca55cc7..a21fdb2 100644
--- a/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch
@@ -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
  
  	},
  };
diff --git a/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch
index cad29a5..82f94f6 100644
--- a/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.14/526-board_CT6373-1.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch
index 9cc6777..30b4b1c 100644
--- a/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
index 67d95f9..31d7edd 100644
--- a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
@@ -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
  		}
  	}
  
diff --git a/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
index 9d27f44..83eb1d5 100644
--- a/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/530-board_963281T_TEF.patch b/target/linux/brcm63xx/patches-3.14/530-board_963281T_TEF.patch
index f9ea843..bfa2333 100644
--- a/target/linux/brcm63xx/patches-3.14/530-board_963281T_TEF.patch
+++ b/target/linux/brcm63xx/patches-3.14/530-board_963281T_TEF.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch
index 74f5183d..ca52f34 100644
--- a/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch
+++ b/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch
index efdf0d2..267c15f 100644
--- a/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch
+++ b/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
index cf26e88..b2e28a3 100644
--- a/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
index 8ebe39b..fa84657 100644
--- a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
@@ -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();
  
diff --git a/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
index 50120ba..fc21314 100644
--- a/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
index cc7b71c..4fa9f90 100644
--- a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
+++ b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
index 79137a7..33d06f9 100644
--- a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
+++ b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.14/550-alice_gate2_leds.patch
index f0ce959..a21c6ca 100644
--- a/target/linux/brcm63xx/patches-3.14/550-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.14/550-alice_gate2_leds.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/551-96348gw_a_leds.patch b/target/linux/brcm63xx/patches-3.14/551-96348gw_a_leds.patch
index d1c1bd8..83050cc 100644
--- a/target/linux/brcm63xx/patches-3.14/551-96348gw_a_leds.patch
+++ b/target/linux/brcm63xx/patches-3.14/551-96348gw_a_leds.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/552-board_96348gw-10_reset_button.patch b/target/linux/brcm63xx/patches-3.14/552-board_96348gw-10_reset_button.patch
index 25858b7..11c76bf 100644
--- a/target/linux/brcm63xx/patches-3.14/552-board_96348gw-10_reset_button.patch
+++ b/target/linux/brcm63xx/patches-3.14/552-board_96348gw-10_reset_button.patch
@@ -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,
  		},
  	},
diff --git a/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
index 07c39b4..dcba2d0 100644
--- a/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
+++ b/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
@@ -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 = {
diff --git a/target/linux/brcm63xx/patches-3.14/554-board_DWVS0_leds_buttons.patch b/target/linux/brcm63xx/patches-3.14/554-board_DWVS0_leds_buttons.patch
index 54c7d5c..fe4f545 100644
--- a/target/linux/brcm63xx/patches-3.14/554-board_DWVS0_leds_buttons.patch
+++ b/target/linux/brcm63xx/patches-3.14/554-board_DWVS0_leds_buttons.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
index d700093..52a1e6d 100644
--- a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch
@@ -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
diff --git a/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
index b31eee8..7f407da 100644
--- a/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
index c340429..8efc437 100644
--- a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
@@ -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
diff --git a/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
index 97feb37..4172296 100644
--- a/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
+++ b/target/linux/brcm63xx/patches-3.14/558-board_AR1004G.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
index 4409f3c..b7547c6 100644
--- a/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
+++ b/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch
@@ -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,
diff --git a/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
index b1b4973..0c337f1 100644
--- a/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
+++ b/target/linux/brcm63xx/patches-3.14/560-board_963268gu_p300.patch
@@ -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
diff --git a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
index d70a55a..4769ecb 100644
--- a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
+++ b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
@@ -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,