brcm63xx: fix RG100A/DB120 usb port number

Set usbh ports to 2 to fix #15007. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 39681
2014-02-22 11:16:52 +00:00 · 2014-02-22 11:16:52 +00:00 · b8ed6534ca
commit b8ed6534ca
parent 4a2f87bce0
51 changed files with 85 additions and 75 deletions
--- a/target/linux/brcm63xx/patches-3.10/351-set-board-usbh-ports.patch
+++ b/target/linux/brcm63xx/patches-3.10/351-set-board-usbh-ports.patch
@ -0,0 +1,10 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -634,6 +634,7 @@ static struct board_info __initdata boar
+ 	.has_ohci0 = 1,
+ 	.has_pccard = 1,
+ 	.has_ehci0 = 1,
+	.num_usbh_ports			= 2,
+ 
+ 	.leds = {
+ 		{
--- a/target/linux/brcm63xx/patches-3.10/403-6358-enet1-external-mii-clk.patch
+++ b/target/linux/brcm63xx/patches-3.10/403-6358-enet1-external-mii-clk.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -911,6 +911,8 @@ void __init board_prom_init(void)
+@@ -912,6 +912,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/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
+++ b/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
@ -18,7 +18,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
 
 #include <uapi/linux/bcm933xx_hcs.h>
 #include <uapi/linux/bcm963xx_tag.h>
-@@ -968,6 +969,7 @@ int __init board_register_devices(void)
+@@ -969,6 +970,7 @@ int __init board_register_devices(void)
 	int button_count = 0;
 	int led_count = 0;
 	int usbh_ports = 0;
@ -26,7 +26,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
 
 	if (board.has_uart0)
 		bcm63xx_uart_register(0);
-@@ -1013,7 +1015,8 @@ int __init board_register_devices(void)
+@@ -1014,7 +1016,8 @@ int __init board_register_devices(void)
 	 * do this after registering enet devices
 	 */
 #ifdef CONFIG_SSB_PCIHOST
@ -36,7 +36,7 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
 		memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
 		memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
 		if (ssb_arch_register_fallback_sprom(
-@@ -1060,5 +1063,9 @@ int __init board_register_devices(void)
+@@ -1061,5 +1064,9 @@ int __init board_register_devices(void)
 		platform_device_register(&bcm63xx_gpio_keys_device);
 	}
 
--- a/target/linux/brcm63xx/patches-3.10/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
+++ b/target/linux/brcm63xx/patches-3.10/418-MIPS-BCM63XX-pass-caldata-info-to-flash.patch
@ -11,7 +11,7 @@ Subject: [PATCH 69/80] MIPS: BCM63XX: pass caldata info to flash

 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1035,7 +1035,7 @@ int __init board_register_devices(void)
+@@ -1036,7 +1036,7 @@ int __init board_register_devices(void)
 	if (board.num_spis)
 		spi_register_board_info(board.spis, board.num_spis);
 
--- a/target/linux/brcm63xx/patches-3.10/420-BCM63XX-add-endian-check-for-ath9k.patch
+++ b/target/linux/brcm63xx/patches-3.10/420-BCM63XX-add-endian-check-for-ath9k.patch
@ -39,7 +39,7 @@
 		return;
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1065,7 +1065,8 @@ int __init board_register_devices(void)
+@@ -1066,7 +1066,8 @@ int __init board_register_devices(void)
 
 	/* register any fixups */
 	for (i = 0; i < board.has_caldata; i++)
--- a/target/linux/brcm63xx/patches-3.10/421-BCM63XX-add-led-pin-for-ath9k.patch
+++ b/target/linux/brcm63xx/patches-3.10/421-BCM63XX-add-led-pin-for-ath9k.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1066,7 +1066,7 @@ int __init board_register_devices(void)
+@@ -1067,7 +1067,7 @@ int __init board_register_devices(void)
 	/* register any fixups */
 	for (i = 0; i < board.has_caldata; i++)
 		pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset,
--- a/target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
+++ b/target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch
@ -36,7 +36,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
 
 #include <uapi/linux/bcm933xx_hcs.h>
 #include <uapi/linux/bcm963xx_tag.h>
-@@ -1064,9 +1065,19 @@ int __init board_register_devices(void)
+@@ -1065,9 +1066,19 @@ int __init board_register_devices(void)
 	}
 
 	/* register any fixups */
--- a/target/linux/brcm63xx/patches-3.10/500-board-D4PW.patch
+++ b/target/linux/brcm63xx/patches-3.10/500-board-D4PW.patch
@ -57,7 +57,7 @@
 #endif
 
 /*
-@@ -732,6 +782,7 @@ static const struct board_info __initcon
+@@ -733,6 +783,7 @@ static const struct board_info __initcon
 	&board_DV201AMR,
 	&board_96348gw_a,
 	&board_rta1025w_16,
--- a/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.10/501-board-NB4.patch
@ -22,7 +22,7 @@
 static struct board_info board;
 
 /*
-@@ -754,6 +762,601 @@ static struct board_info __initdata boar
+@@ -755,6 +763,601 @@ static struct board_info __initdata boar
 
 	.has_ohci0			= 1,
 };
@ -624,7 +624,7 @@
 #endif
 
 /*
-@@ -790,6 +1393,11 @@ static const struct board_info __initcon
+@@ -791,6 +1394,11 @@ static const struct board_info __initcon
 	&board_96358vw2,
 	&board_AGPFS0,
 	&board_DWVS0,
@ -636,7 +636,7 @@
 #endif
 };
 
-@@ -844,6 +1452,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -845,6 +1453,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();
 
--- a/target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch
+++ b/target/linux/brcm63xx/patches-3.10/502-board-96338W2_E7T.patch
@ -41,7 +41,7 @@
 #endif
 
 /*
-@@ -1372,6 +1406,7 @@ static const struct board_info __initcon
+@@ -1373,6 +1407,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6338
 	&board_96338gw,
 	&board_96338w,
--- a/target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch
+++ b/target/linux/brcm63xx/patches-3.10/503-board-CPVA642.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -753,6 +753,98 @@ static struct board_info __initdata boar
+@@ -754,6 +754,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,
-@@ -1427,6 +1519,7 @@ static const struct board_info __initcon
+@@ -1428,6 +1520,7 @@ static const struct board_info __initcon
 	&board_96358vw,
 	&board_96358vw2,
 	&board_AGPFS0,
--- a/target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch
+++ b/target/linux/brcm63xx/patches-3.10/504-board_dsl_274xb_rev_c.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -889,6 +889,61 @@ static struct board_info __initdata boar
+@@ -890,6 +890,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,
-@@ -1521,6 +1576,7 @@ static const struct board_info __initcon
+@@ -1522,6 +1577,7 @@ static const struct board_info __initcon
 	&board_AGPFS0,
 	&board_CPVA642,
 	&board_DWVS0,
--- a/target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch
+++ b/target/linux/brcm63xx/patches-3.10/505-board_spw500v.patch
@ -68,7 +68,7 @@
 #endif
 
 /*
-@@ -1568,6 +1629,7 @@ static const struct board_info __initcon
+@@ -1569,6 +1630,7 @@ static const struct board_info __initcon
 	&board_96348gw_a,
 	&board_rta1025w_16,
 	&board_96348_D4PW,
--- a/target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch
+++ b/target/linux/brcm63xx/patches-3.10/506-board_gw6200_gw6000.patch
@ -113,7 +113,7 @@
 static struct board_info __initdata board_FAST2404 = {
 	.name				= "F@ST2404",
 	.expected_cpu_id		= 0x6348,
-@@ -1622,6 +1728,8 @@ static const struct board_info __initcon
+@@ -1623,6 +1729,8 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6348
 	&board_96348r,
 	&board_96348gw,
--- a/target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch
+++ b/target/linux/brcm63xx/patches-3.10/507-board-MAGIC.patch
@ -79,7 +79,7 @@
 #endif
 
 /*
-@@ -1738,6 +1810,7 @@ static const struct board_info __initcon
+@@ -1739,6 +1811,7 @@ static const struct board_info __initcon
 	&board_rta1025w_16,
 	&board_96348_D4PW,
 	&board_spw500v,
--- a/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
+++ b/target/linux/brcm63xx/patches-3.10/508-board_hw553.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1777,6 +1777,83 @@ static struct board_info __initdata boar
+@@ -1778,6 +1778,83 @@ static struct board_info __initdata boar
 	.spis = nb4_spi_devices,
 	.num_spis = ARRAY_SIZE(nb4_spi_devices),
 };
@ -84,7 +84,7 @@
 #endif
 
 /*
-@@ -1825,6 +1902,7 @@ static const struct board_info __initcon
+@@ -1826,6 +1903,7 @@ static const struct board_info __initcon
 	&board_nb4_ser_r2,
 	&board_nb4_fxc_r1,
 	&board_nb4_fxc_r2,
--- a/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
+++ b/target/linux/brcm63xx/patches-3.10/509-board_rta1320_16m.patch
@ -46,7 +46,7 @@
 #endif
 
 /*
-@@ -1870,6 +1909,7 @@ static const struct board_info __initcon
+@@ -1871,6 +1910,7 @@ static const struct board_info __initcon
 	&board_96338gw,
 	&board_96338w,
 	&board_96338w2_e7t,
--- a/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
+++ b/target/linux/brcm63xx/patches-3.10/510-board_spw303v.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1893,6 +1893,72 @@ static struct board_info __initdata boar
+@@ -1894,6 +1894,72 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -73,7 +73,7 @@
 #endif
 
 /*
-@@ -1943,6 +2009,7 @@ static const struct board_info __initcon
+@@ -1944,6 +2010,7 @@ static const struct board_info __initcon
 	&board_nb4_fxc_r1,
 	&board_nb4_fxc_r2,
 	&board_HW553,
--- a/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.10/511-board_V2500V.patch
@ -66,7 +66,7 @@
 #endif
 
 /*
-@@ -1994,6 +2053,7 @@ static const struct board_info __initcon
+@@ -1995,6 +2054,7 @@ static const struct board_info __initcon
 	&board_96348_D4PW,
 	&board_spw500v,
 	&board_96348sv,
@ -74,7 +74,7 @@
 #endif
 
 #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2115,6 +2175,22 @@ void __init board_prom_init(void)
+@@ -2116,6 +2176,22 @@ void __init board_prom_init(void)
 		val &= MPI_CSBASE_BASE_MASK;
 	}
 	boot_addr = (u8 *)KSEG1ADDR(val);
--- a/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
+++ b/target/linux/brcm63xx/patches-3.10/512-board_BTV2110.patch
@ -65,7 +65,7 @@
 static struct board_info __initdata board_96348gw = {
 	.name				= "96348GW",
 	.expected_cpu_id		= 0x6348,
-@@ -2054,6 +2112,7 @@ static const struct board_info __initcon
+@@ -2055,6 +2113,7 @@ static const struct board_info __initcon
 	&board_spw500v,
 	&board_96348sv,
 	&board_V2500V_BB,
--- a/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
+++ b/target/linux/brcm63xx/patches-3.10/514-board_ct536_ct5621.patch
@ -52,7 +52,7 @@
 static struct board_info __initdata board_96348gw = {
 	.name				= "96348GW",
 	.expected_cpu_id		= 0x6348,
-@@ -2113,6 +2158,7 @@ static const struct board_info __initcon
+@@ -2114,6 +2159,7 @@ static const struct board_info __initcon
 	&board_96348sv,
 	&board_V2500V_BB,
 	&board_V2110,
--- a/target/linux/brcm63xx/patches-3.10/515-board_DWV-S0_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.10/515-board_DWV-S0_fixes.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1312,6 +1312,8 @@ static struct board_info __initdata boar
+@@ -1313,6 +1313,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,
-@@ -1327,6 +1329,7 @@ static struct board_info __initdata boar
+@@ -1328,6 +1330,7 @@ static struct board_info __initdata boar
 	},
 
 	.has_ohci0			= 1,
--- a/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
+++ b/target/linux/brcm63xx/patches-3.10/516-board_96348A-122.patch
@ -70,7 +70,7 @@
 static struct board_info __initdata board_96348gw = {
 	.name				= "96348GW",
 	.expected_cpu_id		= 0x6348,
-@@ -2162,6 +2225,7 @@ static const struct board_info __initcon
+@@ -2163,6 +2226,7 @@ static const struct board_info __initcon
 	&board_V2500V_BB,
 	&board_V2110,
 	&board_ct536_ct5621,
--- a/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
@ -47,7 +47,7 @@
 #endif
 
 /*
-@@ -2227,6 +2267,7 @@ static const struct board_info __initcon
+@@ -2228,6 +2268,7 @@ static const struct board_info __initcon
 	&board_V2110,
 	&board_ct536_ct5621,
 	&board_96348A_122,
--- a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
@ -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
-@@ -2231,6 +2231,85 @@ static struct board_info __initdata boar
+@@ -2232,6 +2232,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[] = {
-@@ -2285,6 +2364,10 @@ static const struct board_info __initcon
+@@ -2286,6 +2365,10 @@ static const struct board_info __initcon
 	&board_HW553,
 	&board_spw303v,
 #endif
@ -107,7 +107,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 };
 
 /*
-@@ -2466,12 +2549,25 @@ void __init board_prom_init(void)
+@@ -2467,12 +2550,25 @@ void __init board_prom_init(void)
 		bcm63xx_pci_enabled = 1;
 		if (BCMCPU_IS_6348())
 			val |= GPIO_MODE_6348_G2_PCI;
--- a/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/521-bcm63xx-add-support-for-96368MVNgr-board.patch
@ -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
-@@ -2307,6 +2307,72 @@ static struct board_info __initdata boar
+@@ -2308,6 +2308,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
 
 /*
-@@ -2367,6 +2433,7 @@ static const struct board_info __initcon
+@@ -2368,6 +2434,7 @@ static const struct board_info __initcon
 
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
--- a/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
 #endif
 
 /*
-@@ -2416,6 +2486,7 @@ static const struct board_info __initcon
+@@ -2417,6 +2487,7 @@ static const struct board_info __initcon
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
--- a/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-3.10/524-board_dsl_274xb_rev_f.patch
@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
 #endif
 
 /*
-@@ -2487,6 +2592,7 @@ static const struct board_info __initcon
+@@ -2488,6 +2593,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
 	&board_963281TAN,
--- a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
+++ b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch
@ -60,7 +60,7 @@
 #endif
 
 /*
-@@ -2622,6 +2675,7 @@ static const struct board_info __initcon
+@@ -2623,6 +2676,7 @@ static const struct board_info __initcon
 	&board_ct536_ct5621,
 	&board_96348A_122,
 	&board_CPVA502plus,
--- a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch
@ -14,7 +14,7 @@
 static struct board_info board;
 
 /*
-@@ -2346,6 +2353,113 @@ static struct board_info __initdata boar
+@@ -2347,6 +2354,113 @@ static struct board_info __initdata boar
 	.num_spis = ARRAY_SIZE(nb4_spi_devices),
 };
 
@ -128,7 +128,7 @@
 static struct board_info __initdata board_HW553 = {
 	.name                           = "HW553",
 	.expected_cpu_id                = 0x6358,
-@@ -2690,6 +2804,7 @@ static const struct board_info __initcon
+@@ -2691,6 +2805,7 @@ static const struct board_info __initcon
 	&board_nb4_ser_r2,
 	&board_nb4_fxc_r1,
 	&board_nb4_fxc_r2,
--- a/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -2602,6 +2602,73 @@ static struct board_info __initdata boar
+@@ -2603,6 +2603,73 @@ static struct board_info __initdata boar
 		},
 	}
 };
@ -74,7 +74,7 @@
 #endif
 
 /*
-@@ -2807,6 +2874,7 @@ static const struct board_info __initcon
+@@ -2808,6 +2875,7 @@ static const struct board_info __initcon
 	&board_ct6373_1,
 	&board_HW553,
 	&board_spw303v,
--- a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch
@ -17,7 +17,7 @@
 
 #define CT6373_PID_OFFSET		0xff80
 #define CT6373_74X164_GPIO_BASE	64
-@@ -2671,6 +2674,104 @@ static struct board_info __initdata boar
+@@ -2672,6 +2675,104 @@ static struct board_info __initdata boar
 };
 #endif
 
@ -122,7 +122,7 @@
 /*
  * known 6368 boards
  */
-@@ -2877,6 +2978,10 @@ static const struct board_info __initcon
+@@ -2878,6 +2979,10 @@ static const struct board_info __initcon
 	&board_DVAG3810BN,
 #endif
 
@ -133,7 +133,7 @@
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
 	&board_96368mvngr,
-@@ -2944,6 +3049,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2945,6 +3050,11 @@ static void __init boardid_fixup(u8 *boo
 		}
 	}
 
--- a/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch
@ -58,7 +58,7 @@
 static struct board_info __initdata board_rta1025w_16 = {
 	.name				= "RTA1025W_16",
 	.expected_cpu_id		= 0x6348,
-@@ -2946,6 +2997,7 @@ static const struct board_info __initcon
+@@ -2947,6 +2998,7 @@ static const struct board_info __initcon
 	&board_96348gw_10,
 	&board_96348gw_11,
 	&board_FAST2404,
--- a/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch
+++ b/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch
@ -127,7 +127,7 @@
 static struct board_info __initdata board_dsl_274xb_f1 = {
 	.name				= "AW4339U",
 	.expected_cpu_id		= 0x6328,
-@@ -2978,6 +3098,7 @@ static const struct board_info __initcon
+@@ -2979,6 +3099,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
 	&board_963281TAN,
--- a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
+++ b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
@ -80,7 +80,7 @@
 static struct board_info __initdata board_963281TAN = {
 	.name				= "963281TAN",
 	.expected_cpu_id		= 0x6328,
-@@ -3097,6 +3170,7 @@ static const struct board_info __initcon
+@@ -3098,6 +3171,7 @@ static const struct board_info __initcon
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
--- a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
+++ b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
@ -74,7 +74,7 @@
 static struct board_info __initdata board_96328A_1441N1 = {
 	.name					= "96328A-1441N1",
 	.expected_cpu_id			= 0x6328,
-@@ -3170,6 +3237,7 @@ static const struct board_info __initcon
+@@ -3171,6 +3238,7 @@ static const struct board_info __initcon
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
--- a/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch
@ -56,7 +56,7 @@
 #endif
 
 /*
-@@ -3251,6 +3300,7 @@ static const struct board_info __initcon
+@@ -3252,6 +3301,7 @@ static const struct board_info __initcon
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6345
 	&board_96345gw2,
--- a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2900,6 +2900,492 @@ static struct board_info __initdata boar
+@@ -2901,6 +2901,492 @@ static struct board_info __initdata boar
 	},
 };
 
@ -493,7 +493,7 @@
  /* T-Home Speedport W 303V Typ B */
 static struct board_info __initdata board_spw303v = {
 	.name			= "96358-502V",
-@@ -3339,6 +3825,10 @@ static const struct board_info __initcon
+@@ -3340,6 +3826,10 @@ static const struct board_info __initcon
 	&board_nb4_fxc_r2,
 	&board_ct6373_1,
 	&board_HW553,
@ -504,7 +504,7 @@
 	&board_spw303v,
 	&board_DVAG3810BN,
 #endif
-@@ -3404,13 +3894,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3405,13 +3895,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();
 
--- a/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch
@ -61,7 +61,7 @@
 #endif
 
 /*
-@@ -3787,6 +3841,7 @@ static const struct board_info __initcon
+@@ -3788,6 +3842,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6345
 	&board_96345gw2,
 	&board_rta770bw,
--- a/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch
+++ b/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch
@ -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,
-@@ -3831,6 +3947,7 @@ static const struct board_info __initcon
+@@ -3832,6 +3948,7 @@ static const struct board_info __initcon
 	&board_963281TAN,
 	&board_963281T_TEF,
 	&board_dsl_274xb_f1,
--- a/target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -3786,6 +3786,96 @@ static struct board_info __initdata boar
+@@ -3787,6 +3787,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
 
 /*
-@@ -4007,6 +4097,7 @@ static const struct board_info __initcon
+@@ -4008,6 +4098,7 @@ static const struct board_info __initcon
 
 #ifdef CONFIG_BCM63XX_CPU_6362
 	&board_nb6,
--- a/target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -2210,6 +2210,99 @@ static struct board_info __initdata boar
+@@ -2211,6 +2211,99 @@ static struct board_info __initdata boar
 
 	.has_ohci0 = 1,
 	.has_ehci0 = 1,
--- a/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
+++ b/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
@ -85,7 +85,7 @@
 		.force_speed_100	= 1,
 		.force_duplex_full	= 1,
 	},
-@@ -2228,6 +2250,8 @@ static struct board_info __initdata boar
+@@ -2229,6 +2251,8 @@ static struct board_info __initdata boar
 	},
 
 	.enet1 = {
@ -94,7 +94,7 @@
 		.force_speed_100	= 1,
 		.force_duplex_full	= 1,
 	},
-@@ -2345,6 +2369,8 @@ static struct board_info __initdata boar
+@@ -2346,6 +2370,8 @@ static struct board_info __initdata boar
 	},
 
 	.enet1 = {
--- a/target/linux/brcm63xx/patches-3.10/554-board_DWVS0_leds_buttons.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -2377,6 +2377,94 @@ static struct board_info __initdata boar
+@@ -2378,6 +2378,94 @@ static struct board_info __initdata boar
 
 	.has_ohci0			= 1,
 	.has_ehci0			= 1,
--- a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch
@ -94,7 +94,7 @@
  * known 6328 boards
  */
 #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4261,6 +4348,9 @@ static const struct board_info __initcon
+@@ -4262,6 +4349,9 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_3368
 	&board_cvg834g,
 #endif
--- a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch
@ -95,7 +95,7 @@
 #endif
 
 /*
-@@ -4350,6 +4438,7 @@ static const struct board_info __initcon
+@@ -4351,6 +4439,7 @@ static const struct board_info __initcon
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6318
 	&board_96318ref,
--- a/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4430,6 +4430,75 @@ static struct board_info __initdata boar
+@@ -4431,6 +4431,75 @@ static struct board_info __initdata boar
 #endif
 
 /*
@ -76,7 +76,7 @@
  * all boards
  */
 static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4514,6 +4583,9 @@ static const struct board_info __initcon
+@@ -4515,6 +4584,9 @@ static const struct board_info __initcon
 	&board_96368mvwg,
 	&board_96368mvngr,
 #endif
--- a/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch
+++ b/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch
@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 #endif
 
 /*
-@@ -4550,6 +4595,7 @@ static const struct board_info __initcon
+@@ -4551,6 +4596,7 @@ static const struct board_info __initcon
 	&board_96348A_122,
 	&board_CPVA502plus,
 	&board_96348W3,
--- a/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch
+++ b/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4541,6 +4541,108 @@ static struct board_info __initdata boar
+@@ -4542,6 +4542,108 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -109,7 +109,7 @@
 #endif
 
 /*
-@@ -4631,6 +4733,7 @@ static const struct board_info __initcon
+@@ -4632,6 +4734,7 @@ static const struct board_info __initcon
 #endif
 #ifdef CONFIG_BCM63XX_CPU_63268
 	&board_963269bhr,
--- a/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -4478,6 +4478,131 @@ static struct board_info __initdata boar
+@@ -4479,6 +4479,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,
-@@ -4732,6 +4857,7 @@ static const struct board_info __initcon
+@@ -4733,6 +4858,7 @@ static const struct board_info __initcon
 	&board_96368mvngr,
 #endif
 #ifdef CONFIG_BCM63XX_CPU_63268
--- a/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-3.10/801-ssb_export_fallback_sprom.patch
@ -8,7 +8,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_gpio.h>
 #include <linux/spi/74x164.h>
-@@ -4868,7 +4869,7 @@ static const struct board_info __initcon
+@@ -4869,7 +4870,7 @@ static const struct board_info __initcon
  * bcm4318 WLAN work
  */
 #ifdef CONFIG_SSB_PCIHOST
@ -17,7 +17,7 @@
 	.revision		= 0x02,
 	.board_rev		= 0x17,
 	.country_code		= 0x0,
-@@ -4888,6 +4889,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -4889,6 +4890,7 @@ static struct ssb_sprom bcm63xx_sprom =
 	.boardflags_lo		= 0x2848,
 	.boardflags_hi		= 0x0000,
 };