brcm63xx: do not add twice the same field to board

Changeset r39302 updated a board section and added twice .has_ehci0, this is not necessary, so fix it. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 39304
10 years ago · 0650ce9ec4
parent 053d596297
commit 0650ce9ec4
48 changed files with 86 additions and 94 deletions
--- a/target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.patch
+++ b/target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.patch
@ -95,15 +95,7 @@
  * _REG relative to RSET_USBD
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -299,6 +299,7 @@ static struct board_info __initdata boar
- 	.has_ohci0			= 1,
- 	.has_pccard			= 1,
- 	.has_ehci0			= 1,
-+	.has_ehci0			= 1,
- 
- 	.has_dsp			= 1,
- 	.dsp = {
-@@ -914,6 +915,15 @@ void __init board_prom_init(void)
+@@ -914,6 +914,15 @@ void __init board_prom_init(void)
 	}
 
 	bcm_gpio_writel(val, GPIO_MODE_REG);
--- 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
-@@ -912,6 +912,8 @@ void __init board_prom_init(void)
+@@ -911,6 +911,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)
+@@ -967,6 +968,7 @@ int __init board_register_devices(void)
 {
 	int button_count = 0;
 	int led_count = 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);
-@@ -1006,7 +1008,8 @@ int __init board_register_devices(void)
+@@ -1005,7 +1007,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(
-@@ -1053,5 +1056,9 @@ int __init board_register_devices(void)
+@@ -1052,5 +1055,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
-@@ -1028,7 +1028,7 @@ int __init board_register_devices(void)
+@@ -1027,7 +1027,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
-@@ -1058,7 +1058,8 @@ int __init board_register_devices(void)
+@@ -1057,7 +1057,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
-@@ -1059,7 +1059,7 @@ int __init board_register_devices(void)
+@@ -1058,7 +1058,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>
-@@ -1057,9 +1058,19 @@ int __init board_register_devices(void)
+@@ -1056,9 +1057,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
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -556,6 +556,56 @@ static struct board_info __initdata boar
+@@ -555,6 +555,56 @@ static struct board_info __initdata boar
 
 	.has_ohci0 = 1,
 };
@ -57,7 +57,7 @@
 #endif
 
 /*
-@@ -733,6 +783,7 @@ static const struct board_info __initcon
+@@ -732,6 +782,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;
 
 /*
-@@ -755,6 +763,596 @@ static struct board_info __initdata boar
+@@ -754,6 +762,596 @@ static struct board_info __initdata boar
 
 	.has_ohci0			= 1,
 };
@ -619,7 +619,7 @@
 #endif
 
 /*
-@@ -791,6 +1389,11 @@ static const struct board_info __initcon
+@@ -790,6 +1388,11 @@ static const struct board_info __initcon
 	&board_96358vw2,
 	&board_AGPFS0,
 	&board_DWVS0,
@ -631,7 +631,7 @@
 #endif
 };
 
-@@ -845,6 +1448,16 @@ static void __init boardid_fixup(u8 *boo
+@@ -844,6 +1447,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
 
 /*
-@@ -1368,6 +1402,7 @@ static const struct board_info __initcon
+@@ -1367,6 +1401,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
-@@ -754,6 +754,98 @@ static struct board_info __initdata boar
+@@ -753,6 +753,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,
-@@ -1423,6 +1515,7 @@ static const struct board_info __initcon
+@@ -1422,6 +1514,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
-@@ -890,6 +890,61 @@ static struct board_info __initdata boar
+@@ -889,6 +889,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,
-@@ -1517,6 +1572,7 @@ static const struct board_info __initcon
+@@ -1516,6 +1571,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
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -648,6 +648,67 @@ static struct board_info __initdata boar
+@@ -647,6 +647,67 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -68,7 +68,7 @@
 #endif
 
 /*
-@@ -1564,6 +1625,7 @@ static const struct board_info __initcon
+@@ -1563,6 +1624,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
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -515,6 +515,112 @@ static struct board_info __initdata boar
+@@ -514,6 +514,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,
-@@ -1618,6 +1724,8 @@ static const struct board_info __initcon
+@@ -1617,6 +1723,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
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -815,6 +815,78 @@ static struct board_info __initdata boar
+@@ -814,6 +814,78 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -79,7 +79,7 @@
 #endif
 
 /*
-@@ -1734,6 +1806,7 @@ static const struct board_info __initcon
+@@ -1733,6 +1805,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
-@@ -1773,6 +1773,82 @@ static struct board_info __initdata boar
+@@ -1772,6 +1772,82 @@ static struct board_info __initdata boar
 	.spis = nb4_spi_devices,
 	.num_spis = ARRAY_SIZE(nb4_spi_devices),
 };
@ -83,7 +83,7 @@
 #endif
 
 /*
-@@ -1821,6 +1897,7 @@ static const struct board_info __initcon
+@@ -1820,6 +1896,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
 
 /*
-@@ -1865,6 +1904,7 @@ static const struct board_info __initcon
+@@ -1864,6 +1903,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
-@@ -1888,6 +1888,72 @@ static struct board_info __initdata boar
+@@ -1887,6 +1887,72 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -73,7 +73,7 @@
 #endif
 
 /*
-@@ -1938,6 +2004,7 @@ static const struct board_info __initcon
+@@ -1937,6 +2003,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
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -926,6 +926,65 @@ static struct board_info __initdata boar
+@@ -925,6 +925,65 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -66,7 +66,7 @@
 #endif
 
 /*
-@@ -1989,6 +2048,7 @@ static const struct board_info __initcon
+@@ -1988,6 +2047,7 @@ static const struct board_info __initcon
 	&board_96348_D4PW,
 	&board_spw500v,
 	&board_96348sv,
@ -74,7 +74,7 @@
 #endif
 
 #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2110,6 +2170,22 @@ void __init board_prom_init(void)
+@@ -2109,6 +2169,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
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -486,6 +486,64 @@ static struct board_info __initdata boar
+@@ -485,6 +485,64 @@ static struct board_info __initdata boar
 	},
 };
 
@ -65,7 +65,7 @@
 static struct board_info __initdata board_96348gw = {
 	.name				= "96348GW",
 	.expected_cpu_id		= 0x6348,
-@@ -2049,6 +2107,7 @@ static const struct board_info __initcon
+@@ -2048,6 +2106,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
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -544,6 +544,51 @@ static struct board_info __initdata boar
+@@ -543,6 +543,51 @@ static struct board_info __initdata boar
 };
 
 
@ -52,7 +52,7 @@
 static struct board_info __initdata board_96348gw = {
 	.name				= "96348GW",
 	.expected_cpu_id		= 0x6348,
-@@ -2108,6 +2153,7 @@ static const struct board_info __initcon
+@@ -2107,6 +2152,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
-@@ -1313,6 +1313,8 @@ static struct board_info __initdata boar
+@@ -1312,6 +1312,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,
-@@ -1328,6 +1330,7 @@ static struct board_info __initdata boar
+@@ -1327,6 +1329,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
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -589,6 +589,69 @@ static struct board_info __initdata boar
+@@ -588,6 +588,69 @@ static struct board_info __initdata boar
 	},
 };
 
@ -70,7 +70,7 @@
 static struct board_info __initdata board_96348gw = {
 	.name				= "96348GW",
 	.expected_cpu_id		= 0x6348,
-@@ -2157,6 +2220,7 @@ static const struct board_info __initcon
+@@ -2156,6 +2219,7 @@ static const struct board_info __initcon
 	&board_V2500V_BB,
 	&board_V2110,
 	&board_ct536_ct5621,
--- a/target/linux/brcm63xx/patches-3.10/517-RTA1205W_16_uart_fixes.patch
+++ b/target/linux/brcm63xx/patches-3.10/517-RTA1205W_16_uart_fixes.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -854,6 +854,7 @@ static struct board_info __initdata boar
+@@ -853,6 +853,7 @@ static struct board_info __initdata boar
 	.name				= "RTA1025W_16",
 	.expected_cpu_id		= 0x6348,
 
--- a/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1152,6 +1152,46 @@ static struct board_info __initdata boar
+@@ -1151,6 +1151,46 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -47,7 +47,7 @@
 #endif
 
 /*
-@@ -2222,6 +2262,7 @@ static const struct board_info __initcon
+@@ -2221,6 +2261,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
-@@ -2226,6 +2226,85 @@ static struct board_info __initdata boar
+@@ -2225,6 +2225,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[] = {
-@@ -2280,6 +2359,10 @@ static const struct board_info __initcon
+@@ -2279,6 +2358,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.
 };
 
 /*
-@@ -2461,12 +2544,25 @@ void __init board_prom_init(void)
+@@ -2460,12 +2543,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
-@@ -2302,6 +2302,72 @@ static struct board_info __initdata boar
+@@ -2301,6 +2301,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
 
 /*
-@@ -2362,6 +2428,7 @@ static const struct board_info __initcon
+@@ -2361,6 +2427,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
 
 /*
-@@ -2411,6 +2481,7 @@ static const struct board_info __initcon
+@@ -2410,6 +2480,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
 
 /*
-@@ -2482,6 +2587,7 @@ static const struct board_info __initcon
+@@ -2481,6 +2586,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
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1399,6 +1399,59 @@ static struct board_info __initdata boar
+@@ -1398,6 +1398,59 @@ static struct board_info __initdata boar
 	},
 };
 
@ -60,7 +60,7 @@
 #endif
 
 /*
-@@ -2617,6 +2670,7 @@ static const struct board_info __initcon
+@@ -2616,6 +2669,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;
 
 /*
-@@ -2342,6 +2349,113 @@ static struct board_info __initdata boar
+@@ -2341,6 +2348,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,
-@@ -2685,6 +2799,7 @@ static const struct board_info __initcon
+@@ -2684,6 +2798,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
-@@ -2597,6 +2597,73 @@ static struct board_info __initdata boar
+@@ -2596,6 +2596,73 @@ static struct board_info __initdata boar
 		},
 	}
 };
@ -74,7 +74,7 @@
 #endif
 
 /*
-@@ -2802,6 +2869,7 @@ static const struct board_info __initcon
+@@ -2801,6 +2868,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
-@@ -2666,6 +2669,103 @@ static struct board_info __initdata boar
+@@ -2665,6 +2668,103 @@ static struct board_info __initdata boar
 };
 #endif
 
@ -121,7 +121,7 @@
 /*
  * known 6368 boards
  */
-@@ -2872,6 +2972,10 @@ static const struct board_info __initcon
+@@ -2871,6 +2971,10 @@ static const struct board_info __initcon
 	&board_DVAG3810BN,
 #endif
 
@ -132,7 +132,7 @@
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
 	&board_96368mvngr,
-@@ -2939,6 +3043,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2938,6 +3042,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
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1067,6 +1067,57 @@ static struct board_info __initdata boar
+@@ -1066,6 +1066,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,
-@@ -2940,6 +2991,7 @@ static const struct board_info __initcon
+@@ -2939,6 +2990,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
@ -126,7 +126,7 @@
 static struct board_info __initdata board_dsl_274xb_f1 = {
 	.name				= "AW4339U",
 	.expected_cpu_id		= 0x6328,
-@@ -2972,6 +3091,7 @@ static const struct board_info __initcon
+@@ -2971,6 +3090,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
@ -79,7 +79,7 @@
 static struct board_info __initdata board_963281TAN = {
 	.name				= "963281TAN",
 	.expected_cpu_id		= 0x6328,
-@@ -3090,6 +3162,7 @@ static const struct board_info __initcon
+@@ -3089,6 +3161,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
@ -73,7 +73,7 @@
 static struct board_info __initdata board_96328A_1441N1 = {
 	.name					= "96328A-1441N1",
 	.expected_cpu_id			= 0x6328,
-@@ -3162,6 +3228,7 @@ static const struct board_info __initcon
+@@ -3161,6 +3227,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
 
 /*
-@@ -3242,6 +3291,7 @@ static const struct board_info __initcon
+@@ -3241,6 +3290,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
-@@ -2892,6 +2892,488 @@ static struct board_info __initdata boar
+@@ -2891,6 +2891,488 @@ static struct board_info __initdata boar
 	},
 };
 
@ -489,7 +489,7 @@
  /* T-Home Speedport W 303V Typ B */
 static struct board_info __initdata board_spw303v = {
 	.name			= "96358-502V",
-@@ -3330,6 +3812,10 @@ static const struct board_info __initcon
+@@ -3329,6 +3811,10 @@ static const struct board_info __initcon
 	&board_nb4_fxc_r2,
 	&board_ct6373_1,
 	&board_HW553,
@ -500,7 +500,7 @@
 	&board_spw303v,
 	&board_DVAG3810BN,
 #endif
-@@ -3395,13 +3881,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3394,13 +3880,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
 
 /*
-@@ -3774,6 +3828,7 @@ static const struct board_info __initcon
+@@ -3773,6 +3827,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6345
 	&board_96345gw2,
 	&board_rta770bw,
--- 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
-@@ -2092,6 +2092,99 @@ static struct board_info __initdata boar
+@@ -2091,6 +2091,99 @@ static struct board_info __initdata boar
 
 	.has_ohci0 = 1,
 	.has_ehci0 = 1,
--- a/target/linux/brcm63xx/patches-3.10/551-96348gw_a_leds.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -1537,6 +1537,19 @@ static struct board_info __initdata boar
+@@ -1536,6 +1536,19 @@ static struct board_info __initdata boar
 	},
 
 	.has_ohci0 = 1,
--- a/target/linux/brcm63xx/patches-3.10/552-board_96348gw-10_reset_button.patch
+++ b/target/linux/brcm63xx/patches-3.10/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
-@@ -997,6 +997,17 @@ static struct board_info __initdata boar
+@@ -996,6 +996,17 @@ static struct board_info __initdata boar
 			.active_low	= 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
@ -27,7 +27,7 @@
 		.force_speed_100	= 1,
 		.force_duplex_full	= 1,
 	},
-@@ -1025,6 +1031,8 @@ static struct board_info __initdata boar
+@@ -1024,6 +1030,8 @@ static struct board_info __initdata boar
 	},
 
 	.enet1 = {
@ -36,7 +36,7 @@
 		.force_speed_100	= 1,
 		.force_duplex_full	= 1,
 	},
-@@ -1254,6 +1262,8 @@ static struct board_info __initdata boar
+@@ -1253,6 +1261,8 @@ static struct board_info __initdata boar
 		.use_internal_phy	= 1,
 	},
 	.enet1 = {
@ -45,7 +45,7 @@
 		.force_speed_100	= 1,
 		.force_duplex_full	= 1,
 	},
-@@ -1429,6 +1439,8 @@ static struct board_info __initdata boar
+@@ -1428,6 +1438,8 @@ static struct board_info __initdata boar
 	},
 
 	.enet1 = {
@ -54,7 +54,7 @@
 		.force_speed_100	= 1,
 		.force_duplex_full	= 1,
 	},
-@@ -1543,6 +1555,12 @@ static struct board_info __initdata boar
+@@ -1542,6 +1554,12 @@ static struct board_info __initdata boar
 		.use_internal_phy	= 1,
 	},
 	.enet1 = {
@ -67,7 +67,7 @@
 		.force_speed_100	= 1,
 		.force_duplex_full	= 1,
 	},
-@@ -1918,6 +1936,8 @@ static struct board_info __initdata boar
+@@ -1917,6 +1935,8 @@ static struct board_info __initdata boar
 	},
 
 	.enet1 = {
@ -76,7 +76,7 @@
 		.force_speed_100	= 1,
 		.force_duplex_full	= 1,
 	},
-@@ -1970,6 +1990,8 @@ static struct board_info __initdata boar
+@@ -1969,6 +1989,8 @@ static struct board_info __initdata boar
 	},
 
 	.enet1 = {
@ -85,7 +85,7 @@
 		.force_speed_100	= 1,
 		.force_duplex_full	= 1,
 	},
-@@ -2110,6 +2132,8 @@ static struct board_info __initdata boar
+@@ -2109,6 +2131,8 @@ static struct board_info __initdata boar
 	},
 
 	.enet1 = {
@ -94,7 +94,7 @@
 		.force_speed_100	= 1,
 		.force_duplex_full	= 1,
 	},
-@@ -2227,6 +2251,8 @@ static struct board_info __initdata boar
+@@ -2226,6 +2250,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
-@@ -2259,6 +2259,94 @@ static struct board_info __initdata boar
+@@ -2258,6 +2258,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
@ -93,7 +93,7 @@
  * known 6328 boards
  */
 #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4042,6 +4128,9 @@ static const struct board_info __initcon
+@@ -4041,6 +4127,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
@ -94,7 +94,7 @@
 #endif
 
 /*
-@@ -4130,6 +4217,7 @@ static const struct board_info __initcon
+@@ -4129,6 +4216,7 @@ static const struct board_info __initcon
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6318
 	&board_96318ref,
--- 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>
-@@ -4298,7 +4299,7 @@ static const struct board_info __initcon
+@@ -4297,7 +4298,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,
-@@ -4318,6 +4319,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -4317,6 +4318,7 @@ static struct ssb_sprom bcm63xx_sprom =
 	.boardflags_lo		= 0x2848,
 	.boardflags_hi		= 0x0000,
 };