diff options
author | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:28 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:28 +0000 |
commit | 439fe41813e5bf898a9c3a5343f62ba02f889006 (patch) | |
tree | 4f918742ad427491b74d3e98e0b6c8dfd222469c /target/linux/brcm63xx | |
parent | b1c4a0aed5cc6c519d8b19ed7fea5c134d137774 (diff) | |
download | upstream-439fe41813e5bf898a9c3a5343f62ba02f889006.tar.gz upstream-439fe41813e5bf898a9c3a5343f62ba02f889006.tar.bz2 upstream-439fe41813e5bf898a9c3a5343f62ba02f889006.zip |
brcm63xx: CPVA502+ board fixes
Some fixes for Telsey CPVA502+ bcm6348 routers:
- reset the external PHY (eth1) with proper platform code, not using a led definiton
- eth1 is an external phy, not a switch, deleted forced link speed
- fixed led color
Patch made for 3.14 kernel patches.
Signed-off-by: Daniel Gonzalez <dgcbueu@gmail.com>
[jogo: also fix 3.14, refresh patches]
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 41420
Diffstat (limited to 'target/linux/brcm63xx')
55 files changed, 103 insertions, 111 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.10/519_board_CPVA502plus.patch index b5ae101c33..a18d878d0c 100644 --- 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 -@@ -1151,6 +1151,46 @@ static struct board_info __initdata boar +@@ -1151,6 +1151,42 @@ static struct board_info __initdata boar }, }, }; @@ -21,8 +21,6 @@ + .enet1 = { + .has_phy = 1, + .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, + }, + + .leds = { @@ -32,22 +30,20 @@ + .active_low = 1, + }, + { -+ .name = "CPVA502+:green:link", ++ .name = "CPVA502+:amber:link", + .gpio = 5, + .active_low = 1, + }, -+ { -+ .name = "CPVA502+:green:feth1", /* FIXME:does gpio4 enable eth1 phy? */ -+ .gpio = 4, -+ .active_low = 1, -+ }, + }, ++ ++ .ephy_reset_gpio = 4, ++ .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, +}; + #endif /* -@@ -2228,6 +2268,7 @@ static const struct board_info __initcon +@@ -2228,6 +2264,7 @@ static const struct board_info __initcon &board_V2110, &board_ct536_ct5621, &board_96348A_122, diff --git 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 index 8ff14aefbb..735fe776a8 100644 --- 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 -@@ -2232,6 +2232,85 @@ static struct board_info __initdata boar +@@ -2228,6 +2228,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[] = { -@@ -2286,6 +2365,10 @@ static const struct board_info __initcon +@@ -2282,6 +2361,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. }; /* -@@ -2467,12 +2550,25 @@ void __init board_prom_init(void) +@@ -2463,12 +2546,25 @@ void __init board_prom_init(void) bcm63xx_pci_enabled = 1; if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G2_PCI; diff --git 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 index f29709692a..91b7965a55 100644 --- 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 -@@ -2308,6 +2308,72 @@ static struct board_info __initdata boar +@@ -2304,6 +2304,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 /* -@@ -2368,6 +2434,7 @@ static const struct board_info __initcon +@@ -2364,6 +2430,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, diff --git 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 index 114778d58f..85df11582d 100644 --- 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 /* -@@ -2417,6 +2487,7 @@ static const struct board_info __initcon +@@ -2413,6 +2483,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, diff --git 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 index 3d5b5d1b4f..8e2c0777d2 100644 --- 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 /* -@@ -2488,6 +2593,7 @@ static const struct board_info __initcon +@@ -2484,6 +2589,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, diff --git a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch index 52134d4109..9564720db8 100644 --- a/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch +++ b/target/linux/brcm63xx/patches-3.10/525-board_96348w3.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1398,6 +1398,59 @@ static struct board_info __initdata boar - }, +@@ -1394,6 +1394,59 @@ static struct board_info __initdata boar + .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, }; +/* NetGear DG834G v4 */ @@ -60,7 +60,7 @@ #endif /* -@@ -2623,6 +2676,7 @@ static const struct board_info __initcon +@@ -2619,6 +2672,7 @@ static const struct board_info __initcon &board_ct536_ct5621, &board_96348A_122, &board_CPVA502plus, diff --git a/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.10/526-board_CT6373-1.patch index cd0122bcfb..aad704d3a5 100644 --- 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; /* -@@ -2347,6 +2354,113 @@ static struct board_info __initdata boar +@@ -2343,6 +2350,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, -@@ -2691,6 +2805,7 @@ static const struct board_info __initcon +@@ -2687,6 +2801,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.10/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.10/527-board_dva-g3810bn-tl-1.patch index a555298f03..202cf3183d 100644 --- 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 -@@ -2603,6 +2603,73 @@ static struct board_info __initdata boar +@@ -2599,6 +2599,73 @@ static struct board_info __initdata boar }, } }; @@ -74,7 +74,7 @@ #endif /* -@@ -2808,6 +2875,7 @@ static const struct board_info __initcon +@@ -2804,6 +2871,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, diff --git a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch index 66705fa6f3..347b183e4a 100644 --- 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 -@@ -2672,6 +2675,104 @@ static struct board_info __initdata boar +@@ -2668,6 +2671,104 @@ static struct board_info __initdata boar }; #endif @@ -122,7 +122,7 @@ /* * known 6368 boards */ -@@ -2878,6 +2979,10 @@ static const struct board_info __initcon +@@ -2874,6 +2975,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -133,7 +133,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -2945,6 +3050,11 @@ static void __init boardid_fixup(u8 *boo +@@ -2941,6 +3046,11 @@ static void __init boardid_fixup(u8 *boo } } diff --git a/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.10/529-board_fast2604.patch index 9ebc02ae5c..657eec1ca4 100644 --- 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, -@@ -2947,6 +2998,7 @@ static const struct board_info __initcon +@@ -2943,6 +2994,7 @@ static const struct board_info __initcon &board_96348gw_10, &board_96348gw_11, &board_FAST2404, diff --git a/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch b/target/linux/brcm63xx/patches-3.10/530-board_963281T_TEF.patch index d490f28df1..545670bad4 100644 --- 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, -@@ -2979,6 +3099,7 @@ static const struct board_info __initcon +@@ -2975,6 +3095,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, diff --git a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch index 12a08873b5..218f53082e 100644 --- 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, -@@ -3098,6 +3171,7 @@ static const struct board_info __initcon +@@ -3094,6 +3167,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, diff --git a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch index 3648b2aa4e..84cc56bce7 100644 --- 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, -@@ -3171,6 +3238,7 @@ static const struct board_info __initcon +@@ -3167,6 +3234,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, diff --git a/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.10/533-board_rta770bw.patch index 60a670f8cb..95c15b803a 100644 --- 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 /* -@@ -3252,6 +3301,7 @@ static const struct board_info __initcon +@@ -3248,6 +3297,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, diff --git a/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.10/534-board_hw556.patch index d957a5089d..f1e62cc319 100644 --- 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 -@@ -2901,6 +2901,492 @@ static struct board_info __initdata boar +@@ -2897,6 +2897,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", -@@ -3340,6 +3826,10 @@ static const struct board_info __initcon +@@ -3336,6 +3822,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 -@@ -3405,13 +3895,37 @@ static void __init boardid_fixup(u8 *boo +@@ -3401,13 +3891,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.10/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.10/535-board_rta770w.patch index 6e0cd69a42..521c093d11 100644 --- 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 /* -@@ -3788,6 +3842,7 @@ static const struct board_info __initcon +@@ -3784,6 +3838,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, &board_rta770bw, diff --git a/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.10/536-board_fast2704.patch index bb035df581..f3d700a4d6 100644 --- 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, -@@ -3832,6 +3948,7 @@ static const struct board_info __initcon +@@ -3828,6 +3944,7 @@ static const struct board_info __initcon &board_963281TAN, &board_963281T_TEF, &board_dsl_274xb_f1, diff --git a/target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.10/537-board_fast2504n.patch index d8b65a57cd..bfb2e6608e 100644 --- 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 -@@ -3787,6 +3787,96 @@ static struct board_info __initdata boar +@@ -3783,6 +3783,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 /* -@@ -4008,6 +4098,7 @@ static const struct board_info __initcon +@@ -4004,6 +4094,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, diff --git a/target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.10/550-alice_gate2_leds.patch index 8235396954..543a97ff52 100644 --- 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 -@@ -2211,6 +2211,99 @@ static struct board_info __initdata boar +@@ -2207,6 +2207,99 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, diff --git a/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch index 28a0be9d84..dfdbc06ddb 100644 --- a/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch +++ b/target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch @@ -81,7 +81,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2036,6 +2054,8 @@ static struct board_info __initdata boar +@@ -2032,6 +2050,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -90,7 +90,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2088,6 +2108,8 @@ static struct board_info __initdata boar +@@ -2084,6 +2104,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -99,7 +99,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2229,6 +2251,8 @@ static struct board_info __initdata boar +@@ -2225,6 +2247,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -108,7 +108,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2346,6 +2370,8 @@ static struct board_info __initdata boar +@@ -2342,6 +2366,8 @@ static struct board_info __initdata boar }, .enet1 = { diff --git 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 index e21274c98a..aa160ca772 100644 --- 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 -@@ -2378,6 +2378,94 @@ static struct board_info __initdata boar +@@ -2374,6 +2374,94 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, diff --git a/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.10/555-board_96318ref.patch index 5bcfc4cedc..83ea8933a4 100644 --- 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 -@@ -4262,6 +4349,9 @@ static const struct board_info __initcon +@@ -4258,6 +4345,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, #endif diff --git a/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-3.10/556-board_96318ref_p300.patch index 4cd8c9b1d9..e33b44810e 100644 --- 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 /* -@@ -4351,6 +4439,7 @@ static const struct board_info __initcon +@@ -4347,6 +4435,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, diff --git a/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch index 1e62d5651a..251d1387f1 100644 --- 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 -@@ -4431,6 +4431,75 @@ static struct board_info __initdata boar +@@ -4427,6 +4427,75 @@ static struct board_info __initdata boar #endif /* @@ -76,7 +76,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -4515,6 +4584,9 @@ static const struct board_info __initcon +@@ -4511,6 +4580,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, #endif diff --git a/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch index 8b2b1ee04a..0650289656 100644 --- a/target/linux/brcm63xx/patches-3.10/558-board_AR1004G.patch +++ b/target/linux/brcm63xx/patches-3.10/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 -@@ -2208,6 +2208,51 @@ static struct board_info __initdata boar +@@ -2204,6 +2204,51 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl> #endif /* -@@ -4551,6 +4596,7 @@ static const struct board_info __initcon +@@ -4547,6 +4592,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, diff --git a/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-3.10/559-board_vw6339gu.patch index 298a04a252..08e404601e 100644 --- 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 -@@ -4542,6 +4542,108 @@ static struct board_info __initdata boar +@@ -4538,6 +4538,108 @@ static struct board_info __initdata boar }, }, }; @@ -109,7 +109,7 @@ #endif /* -@@ -4632,6 +4734,7 @@ static const struct board_info __initcon +@@ -4628,6 +4730,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_63268 &board_963269bhr, diff --git a/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-3.10/560-board_963268gu_p300.patch index afaf983501..b9b4a843e2 100644 --- 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 -@@ -4479,6 +4479,131 @@ static struct board_info __initdata boar +@@ -4475,6 +4475,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, -@@ -4733,6 +4858,7 @@ static const struct board_info __initcon +@@ -4729,6 +4854,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git 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 index b3ced8d5a2..abbacf4d2f 100644 --- 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> -@@ -4869,7 +4870,7 @@ static const struct board_info __initcon +@@ -4865,7 +4866,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, -@@ -4889,6 +4890,7 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -4885,6 +4886,7 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, }; diff --git a/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch index e11c613577..4887fb24a7 100644 --- a/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch +++ b/target/linux/brcm63xx/patches-3.14/519_board_CPVA502plus.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1139,6 +1139,46 @@ static struct board_info __initdata boar +@@ -1139,6 +1139,42 @@ static struct board_info __initdata boar }, }, }; @@ -21,8 +21,6 @@ + .enet1 = { + .has_phy = 1, + .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, + }, + + .leds = { @@ -32,22 +30,20 @@ + .active_low = 1, + }, + { -+ .name = "CPVA502+:green:link", ++ .name = "CPVA502+:amber:link", + .gpio = 5, + .active_low = 1, + }, -+ { -+ .name = "CPVA502+:green:feth1", /* FIXME:does gpio4 enable eth1 phy? */ -+ .gpio = 4, -+ .active_low = 1, -+ }, + }, ++ ++ .ephy_reset_gpio = 4, ++ .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, +}; + #endif /* -@@ -2220,6 +2260,7 @@ static const struct board_info __initcon +@@ -2220,6 +2256,7 @@ static const struct board_info __initcon &board_V2110, &board_ct536_ct5621, &board_96348A_122, diff --git a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch index 19708bb7d1..aa64bff4f1 100644 --- a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/brcm63xx/patches-3.14/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 -@@ -2224,6 +2224,85 @@ static struct board_info __initdata boar +@@ -2220,6 +2220,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[] = { -@@ -2278,6 +2357,10 @@ static const struct board_info __initcon +@@ -2274,6 +2353,10 @@ static const struct board_info __initcon &board_HW553, &board_spw303v, #endif diff --git a/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch index a8cb12e720..93f7872316 100644 --- a/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch +++ b/target/linux/brcm63xx/patches-3.14/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 -@@ -2300,6 +2300,72 @@ static struct board_info __initdata boar +@@ -2296,6 +2296,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 /* -@@ -2360,6 +2426,7 @@ static const struct board_info __initcon +@@ -2356,6 +2422,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, 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 f5b06d5cbc..0ab119ecf4 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 @@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* -@@ -2409,6 +2479,7 @@ static const struct board_info __initcon +@@ -2405,6 +2475,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, 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 60d926afa5..ca55cc7718 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 @@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* -@@ -2480,6 +2585,7 @@ static const struct board_info __initcon +@@ -2476,6 +2581,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/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch index 6faab97e64..3564428870 100644 --- a/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch +++ b/target/linux/brcm63xx/patches-3.14/525-board_96348w3.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1386,6 +1386,59 @@ static struct board_info __initdata boar - }, +@@ -1382,6 +1382,59 @@ static struct board_info __initdata boar + .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, }; +/* NetGear DG834G v4 */ @@ -60,7 +60,7 @@ #endif /* -@@ -2615,6 +2668,7 @@ static const struct board_info __initcon +@@ -2611,6 +2664,7 @@ static const struct board_info __initcon &board_ct536_ct5621, &board_96348A_122, &board_CPVA502plus, 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 ad3ec7d421..cad29a5d72 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 @@ -14,7 +14,7 @@ .has_ohci0 = 1, .has_pccard = 1, -@@ -2339,6 +2346,117 @@ static struct board_info __initdata boar +@@ -2335,6 +2342,117 @@ static struct board_info __initdata boar .num_spis = ARRAY_SIZE(nb4_spi_devices), }; @@ -132,7 +132,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -2683,6 +2801,7 @@ static const struct board_info __initcon +@@ -2679,6 +2797,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 202cf3183d..9cc6777456 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 -@@ -2599,6 +2599,73 @@ static struct board_info __initdata boar +@@ -2595,6 +2595,73 @@ static struct board_info __initdata boar }, } }; @@ -74,7 +74,7 @@ #endif /* -@@ -2804,6 +2871,7 @@ static const struct board_info __initcon +@@ -2800,6 +2867,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 b3455d39c3..67d95f906f 100644 --- a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch @@ -17,7 +17,7 @@ #define CT6373_PID_OFFSET 0xff80 #define CT6373_74X164_GPIO_BASE 64 -@@ -2668,6 +2671,104 @@ static struct board_info __initdata boar +@@ -2664,6 +2667,104 @@ static struct board_info __initdata boar }; #endif @@ -122,7 +122,7 @@ /* * known 6368 boards */ -@@ -2874,6 +2975,10 @@ static const struct board_info __initcon +@@ -2870,6 +2971,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -133,7 +133,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -2895,6 +3000,11 @@ static void __init boardid_fixup(u8 *boo +@@ -2891,6 +2996,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 52980da367..9d27f44c87 100644 --- a/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch +++ b/target/linux/brcm63xx/patches-3.14/529-board_fast2604.patch @@ -58,7 +58,7 @@ static struct board_info __initdata board_rta1025w_16 = { .name = "RTA1025W_16", .expected_cpu_id = 0x6348, -@@ -2943,6 +2994,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, 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 d3628eca39..f9ea84363a 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 @@ -127,7 +127,7 @@ static struct board_info __initdata board_dsl_274xb_f1 = { .name = "AW4339U", .expected_cpu_id = 0x6328, -@@ -2975,6 +3095,7 @@ static const struct board_info __initcon +@@ -2971,6 +3091,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 d7114d355a..74f5183d61 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 @@ -80,7 +80,7 @@ static struct board_info __initdata board_963281TAN = { .name = "963281TAN", .expected_cpu_id = 0x6328, -@@ -3094,6 +3167,7 @@ static const struct board_info __initcon +@@ -3090,6 +3163,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 07161e8f13..efdf0d2f33 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 @@ -74,7 +74,7 @@ static struct board_info __initdata board_96328A_1441N1 = { .name = "96328A-1441N1", .expected_cpu_id = 0x6328, -@@ -3167,6 +3234,7 @@ static const struct board_info __initcon +@@ -3163,6 +3230,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 3922c78eeb..cf26e88a16 100644 --- a/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch +++ b/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch @@ -56,7 +56,7 @@ #endif /* -@@ -3248,6 +3297,7 @@ static const struct board_info __initcon +@@ -3244,6 +3293,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 04c6b2b93d..8ebe39bef9 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> -@@ -2897,6 +2898,492 @@ static struct board_info __initdata boar +@@ -2893,6 +2894,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", -@@ -3336,6 +3823,10 @@ static const struct board_info __initcon +@@ -3332,6 +3819,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 -@@ -3355,13 +3846,37 @@ static void __init boardid_fixup(u8 *boo +@@ -3351,13 +3842,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 162a920095..50120ba1fb 100644 --- a/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch +++ b/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch @@ -61,7 +61,7 @@ #endif /* -@@ -3785,6 +3839,7 @@ static const struct board_info __initcon +@@ -3781,6 +3835,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 1a89e9021a..cc7b71c54d 100644 --- a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-3.14/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, -@@ -3829,6 +3945,7 @@ static const struct board_info __initcon +@@ -3825,6 +3941,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 821a185793..79137a757f 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 -@@ -3784,6 +3784,96 @@ static struct board_info __initdata boar +@@ -3780,6 +3780,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 /* -@@ -4005,6 +4095,7 @@ static const struct board_info __initcon +@@ -4001,6 +4091,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 e7b0e63372..f0ce9594b6 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 -@@ -2200,6 +2200,99 @@ static struct board_info __initdata boar +@@ -2196,6 +2196,99 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 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 32c20c85ce..07c39b40c6 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 @@ -81,7 +81,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2025,6 +2043,8 @@ static struct board_info __initdata boar +@@ -2021,6 +2039,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -90,7 +90,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2077,6 +2097,8 @@ static struct board_info __initdata boar +@@ -2073,6 +2093,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -99,7 +99,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2218,6 +2240,8 @@ static struct board_info __initdata boar +@@ -2214,6 +2236,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -108,7 +108,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -2335,6 +2359,8 @@ static struct board_info __initdata boar +@@ -2331,6 +2355,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 33f9e92f56..54c7d5cfc5 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 -@@ -2367,6 +2367,94 @@ static struct board_info __initdata boar +@@ -2363,6 +2363,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 dcab01e8ea..d700093c0d 100644 --- a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch +++ b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch @@ -94,7 +94,7 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -4259,6 +4346,9 @@ static const struct board_info __initcon +@@ -4255,6 +4342,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 a6d4d00da4..b31eee8cc0 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 @@ -95,7 +95,7 @@ #endif /* -@@ -4348,6 +4436,7 @@ static const struct board_info __initcon +@@ -4344,6 +4432,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 b9977e2fbf..c340429ede 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 -@@ -4428,6 +4428,75 @@ static struct board_info __initdata boar +@@ -4424,6 +4424,75 @@ static struct board_info __initdata boar #endif /* @@ -76,7 +76,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -4512,6 +4581,9 @@ static const struct board_info __initcon +@@ -4508,6 +4577,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 2b7a094fc0..97feb37dc1 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 -@@ -2197,6 +2197,51 @@ static struct board_info __initdata boar +@@ -2193,6 +2193,51 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl> #endif /* -@@ -4548,6 +4593,7 @@ static const struct board_info __initcon +@@ -4544,6 +4589,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 5b8da2bbd8..4409f3cfaf 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 -@@ -4539,6 +4539,108 @@ static struct board_info __initdata boar +@@ -4535,6 +4535,108 @@ static struct board_info __initdata boar }, }, }; @@ -109,7 +109,7 @@ #endif /* -@@ -4629,6 +4731,7 @@ static const struct board_info __initcon +@@ -4625,6 +4727,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 e15c0933f7..b1b49736b5 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 -@@ -4476,6 +4476,131 @@ static struct board_info __initdata boar +@@ -4472,6 +4472,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, -@@ -4730,6 +4855,7 @@ static const struct board_info __initcon +@@ -4726,6 +4851,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif #ifdef CONFIG_BCM63XX_CPU_63268 |