diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-30 23:26:02 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-30 23:26:02 +0000 |
| commit | 2f38afae4e7bc15571913d499f51929a122c360f (patch) | |
| tree | 2507e12d665b44866013f30f69aca9a2a9008659 /target/linux/brcm63xx | |
| parent | d75bcd95a63c5f8d8a478a23a122a586342090e3 (diff) | |
| download | master-187ad058-2f38afae4e7bc15571913d499f51929a122c360f.tar.gz master-187ad058-2f38afae4e7bc15571913d499f51929a122c360f.tar.bz2 master-187ad058-2f38afae4e7bc15571913d499f51929a122c360f.zip | |
brcm63xx: unbreak board_probe_switch again
Also move it to an earlier place so new boards added are less likely
to confuse quilt.
Fixes #19965.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46148 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx')
76 files changed, 286 insertions, 244 deletions
diff --git a/target/linux/brcm63xx/patches-3.18/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-3.18/427-boards_probe_switch.patch index 0c1024bd2e..b813d098f8 100644 --- a/target/linux/brcm63xx/patches-3.18/553-boards_probe_switch.patch +++ b/target/linux/brcm63xx/patches-3.18/427-boards_probe_switch.patch @@ -1,17 +1,24 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -423,6 +423,10 @@ static struct board_info __initdata boar +@@ -123,6 +123,8 @@ static struct board_info __initdata boar .has_uart0 = 1, .has_enet0 = 1, .enet0 = { + .has_phy = 1, + .phy_id = 0, + .force_speed_100 = 1, + .force_duplex_full = 1, + }, +@@ -166,6 +168,8 @@ static struct board_info __initdata boar + .has_uart0 = 1, + .has_enet0 = 1, + .enet0 = { + .has_phy = 1, + .phy_id = 0, .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -541,6 +545,8 @@ static struct board_info __initdata boar +@@ -277,6 +281,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -20,7 +27,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -574,6 +580,8 @@ static struct board_info __initdata boar +@@ -339,6 +345,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -29,7 +36,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -721,6 +729,8 @@ static struct board_info __initdata boar +@@ -393,6 +401,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -38,7 +45,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -783,6 +793,8 @@ static struct board_info __initdata boar +@@ -453,6 +463,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -47,7 +54,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -824,6 +836,8 @@ static struct board_info __initdata boar +@@ -476,6 +488,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -56,7 +63,16 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -846,6 +860,8 @@ static struct board_info __initdata boar +@@ -495,6 +509,8 @@ static struct board_info __initdata boar + .has_enet1 = 1, + .enet0 = { + .has_phy = 1, ++ .phy_id = 0, ++ .has_phy = 1, + .use_internal_phy = 1, + }, + .enet1 = { +@@ -518,6 +534,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -65,16 +81,16 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -866,6 +882,8 @@ static struct board_info __initdata boar - .use_internal_phy = 1, +@@ -546,6 +564,8 @@ static struct board_info __initdata boar }, + .enet1 = { + .has_phy = 1, + .phy_id = 0, .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -1095,6 +1113,8 @@ static struct board_info __initdata boar +@@ -599,6 +619,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -83,14 +99,19 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -1120,6 +1140,12 @@ static struct board_info __initdata boar +@@ -648,6 +670,8 @@ static struct board_info __initdata boar }, .enet1 = { + .has_phy = 1, + .phy_id = 0, -+ .has_phy = 1, -+ .phy_id = 0, + .force_speed_100 = 1, + .force_duplex_full = 1, + }, +@@ -671,6 +695,8 @@ static struct board_info __initdata boar + }, + + .enet1 = { + .has_phy = 1, + .phy_id = 0, .force_speed_100 = 1, diff --git a/target/linux/brcm63xx/patches-3.18/499-allow_better_context_for_board_patches.patch b/target/linux/brcm63xx/patches-3.18/499-allow_better_context_for_board_patches.patch index de2012b16b..bf51de0361 100644 --- a/target/linux/brcm63xx/patches-3.18/499-allow_better_context_for_board_patches.patch +++ b/target/linux/brcm63xx/patches-3.18/499-allow_better_context_for_board_patches.patch @@ -18,7 +18,7 @@ /* * known 6338 boards -@@ -199,7 +199,7 @@ static struct board_info __initdata boar +@@ -203,7 +203,7 @@ static struct board_info __initdata boar }, }, }; @@ -27,7 +27,7 @@ /* * known 6345 boards -@@ -211,7 +211,7 @@ static struct board_info __initdata boar +@@ -215,7 +215,7 @@ static struct board_info __initdata boar .has_uart0 = 1, }; @@ -36,7 +36,7 @@ /* * known 6348 boards -@@ -524,7 +524,7 @@ static struct board_info __initdata boar +@@ -542,7 +542,7 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -45,7 +45,7 @@ /* * known 6358 boards -@@ -677,7 +677,7 @@ static struct board_info __initdata boar +@@ -703,7 +703,7 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; diff --git a/target/linux/brcm63xx/patches-3.18/500-board-D4PW.patch b/target/linux/brcm63xx/patches-3.18/500-board-D4PW.patch index e00e56499e..5a1a785504 100644 --- a/target/linux/brcm63xx/patches-3.18/500-board-D4PW.patch +++ b/target/linux/brcm63xx/patches-3.18/500-board-D4PW.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -524,6 +524,22 @@ static struct board_info __initdata boar +@@ -542,6 +542,22 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -23,7 +23,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -705,6 +721,7 @@ static const struct board_info __initcon +@@ -731,6 +747,7 @@ static const struct board_info __initcon &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, @@ -31,7 +31,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -736,6 +753,7 @@ static struct of_device_id const bcm963x +@@ -762,6 +779,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, diff --git a/target/linux/brcm63xx/patches-3.18/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.18/501-board-NB4.patch index 97a9c73f85..79d638eb86 100644 --- a/target/linux/brcm63xx/patches-3.18/501-board-NB4.patch +++ b/target/linux/brcm63xx/patches-3.18/501-board-NB4.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -693,6 +693,62 @@ static struct board_info __initdata boar +@@ -719,6 +719,62 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -63,7 +63,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -729,6 +785,8 @@ static const struct board_info __initcon +@@ -755,6 +811,8 @@ static const struct board_info __initcon &board_96358vw2, &board_AGPFS0, &board_DWVS0, @@ -72,7 +72,7 @@ #endif }; -@@ -770,6 +828,8 @@ static struct of_device_id const bcm963x +@@ -796,6 +854,8 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, diff --git a/target/linux/brcm63xx/patches-3.18/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.18/502-board-96338W2_E7T.patch index cfdf03ec7e..f35b76a0b1 100644 --- a/target/linux/brcm63xx/patches-3.18/502-board-96338W2_E7T.patch +++ b/target/linux/brcm63xx/patches-3.18/502-board-96338W2_E7T.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -199,6 +199,20 @@ static struct board_info __initdata boar +@@ -203,6 +203,20 @@ static struct board_info __initdata boar }, }, }; @@ -21,7 +21,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -764,6 +778,7 @@ static const struct board_info __initcon +@@ -790,6 +804,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, &board_96338w, @@ -29,7 +29,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -801,6 +816,7 @@ static struct of_device_id const bcm963x +@@ -827,6 +842,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/brcm63xx/patches-3.18/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-3.18/503-board-CPVA642.patch index c17b8e45be..a102380c64 100644 --- a/target/linux/brcm63xx/patches-3.18/503-board-CPVA642.patch +++ b/target/linux/brcm63xx/patches-3.18/503-board-CPVA642.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -663,6 +663,26 @@ static struct board_info __initdata boar +@@ -685,6 +685,26 @@ static struct board_info __initdata boar }, }; @@ -27,7 +27,7 @@ static struct board_info __initdata board_AGPFS0 = { .name = "AGPF-S0", .expected_cpu_id = 0x6358, -@@ -799,6 +819,7 @@ static const struct board_info __initcon +@@ -825,6 +845,7 @@ static const struct board_info __initcon &board_96358vw, &board_96358vw2, &board_AGPFS0, @@ -35,7 +35,7 @@ &board_DWVS0, &board_nb4_ser_r0, &board_nb4_fxc_r1, -@@ -846,6 +867,7 @@ static struct of_device_id const bcm963x +@@ -872,6 +893,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/brcm63xx/patches-3.18/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-3.18/504-board_dsl_274xb_rev_c.patch index 63c891be1a..2cc72664f0 100644 --- a/target/linux/brcm63xx/patches-3.18/504-board_dsl_274xb_rev_c.patch +++ b/target/linux/brcm63xx/patches-3.18/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 -@@ -728,6 +728,23 @@ static struct board_info __initdata boar +@@ -754,6 +754,23 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -24,7 +24,7 @@ static struct board_info __initdata board_nb4_ser_r0 = { .name = "NB4-SER-r0", .expected_cpu_id = 0x6358, -@@ -821,6 +838,7 @@ static const struct board_info __initcon +@@ -847,6 +864,7 @@ static const struct board_info __initcon &board_AGPFS0, &board_CPVA642, &board_DWVS0, @@ -32,7 +32,7 @@ &board_nb4_ser_r0, &board_nb4_fxc_r1, #endif -@@ -860,6 +878,7 @@ static struct of_device_id const bcm963x +@@ -886,6 +904,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-3.18/505-board_spw500v.patch b/target/linux/brcm63xx/patches-3.18/505-board_spw500v.patch index 8919e88748..bbc7f64035 100644 --- a/target/linux/brcm63xx/patches-3.18/505-board_spw500v.patch +++ b/target/linux/brcm63xx/patches-3.18/505-board_spw500v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -554,6 +554,45 @@ static struct board_info __initdata boar +@@ -572,6 +572,45 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -46,7 +46,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -830,6 +869,7 @@ static const struct board_info __initcon +@@ -856,6 +895,7 @@ static const struct board_info __initcon &board_96348gw_a, &board_rta1025w_16, &board_96348_D4PW, @@ -54,7 +54,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -871,6 +911,7 @@ static struct of_device_id const bcm963x +@@ -897,6 +937,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, diff --git a/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch index 8785db796a..6fc29df195 100644 --- a/target/linux/brcm63xx/patches-3.18/506-board_gw6200_gw6000.patch +++ b/target/linux/brcm63xx/patches-3.18/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 -@@ -451,6 +451,66 @@ static struct board_info __initdata boar +@@ -461,6 +461,66 @@ static struct board_info __initdata boar }, }; @@ -67,7 +67,7 @@ static struct board_info __initdata board_FAST2404 = { .name = "F@ST2404", .expected_cpu_id = 0x6348, -@@ -862,6 +922,8 @@ static const struct board_info __initcon +@@ -888,6 +948,8 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, &board_96348gw, @@ -76,7 +76,7 @@ &board_96348gw_10, &board_96348gw_11, &board_FAST2404, -@@ -912,6 +974,8 @@ static struct of_device_id const bcm963x +@@ -938,6 +1000,8 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, { .compatible = "t-com,spw500v", .data = &board_spw500v, }, diff --git a/target/linux/brcm63xx/patches-3.18/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.18/507-board-MAGIC.patch index 1d513ab3e4..cc4f6c2f74 100644 --- a/target/linux/brcm63xx/patches-3.18/507-board-MAGIC.patch +++ b/target/linux/brcm63xx/patches-3.18/507-board-MAGIC.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -653,6 +653,40 @@ static struct board_info __initdata boar +@@ -671,6 +671,40 @@ static struct board_info __initdata boar .num_board_fixups = ARRAY_SIZE(spw500v_fixups), }, }; @@ -41,7 +41,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -932,6 +966,7 @@ static const struct board_info __initcon +@@ -958,6 +992,7 @@ static const struct board_info __initcon &board_rta1025w_16, &board_96348_D4PW, &board_spw500v, @@ -49,7 +49,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -976,6 +1011,7 @@ static struct of_device_id const bcm963x +@@ -1002,6 +1037,7 @@ static struct of_device_id const bcm963x { .compatible = "t-com,spw500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/brcm63xx/patches-3.18/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.18/508-board_hw553.patch index db0e7413fa..2d71babcb4 100644 --- a/target/linux/brcm63xx/patches-3.18/508-board_hw553.patch +++ b/target/linux/brcm63xx/patches-3.18/508-board_hw553.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -933,6 +933,34 @@ static struct board_info __initdata boar +@@ -959,6 +959,34 @@ static struct board_info __initdata boar .has_ehci0 = 1, .num_usbh_ports = 2, }; @@ -35,7 +35,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -978,6 +1006,7 @@ static const struct board_info __initcon +@@ -1004,6 +1032,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, @@ -43,7 +43,7 @@ #endif }; -@@ -1021,6 +1050,7 @@ static struct of_device_id const bcm963x +@@ -1047,6 +1076,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-3.18/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.18/509-board_rta1320_16m.patch index 9ca684477b..ced00bd893 100644 --- a/target/linux/brcm63xx/patches-3.18/509-board_rta1320_16m.patch +++ b/target/linux/brcm63xx/patches-3.18/509-board_rta1320_16m.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -213,6 +213,21 @@ static struct board_info __initdata boar +@@ -217,6 +217,21 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -22,7 +22,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -977,6 +992,7 @@ static const struct board_info __initcon +@@ -1003,6 +1018,7 @@ static const struct board_info __initcon &board_96338gw, &board_96338w, &board_96338w2_e7t, @@ -30,7 +30,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -1021,6 +1037,7 @@ static struct of_device_id const bcm963x +@@ -1047,6 +1063,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/brcm63xx/patches-3.18/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.18/510-board_spw303v.patch index 1e6da541e5..f903bfc150 100644 --- a/target/linux/brcm63xx/patches-3.18/510-board_spw303v.patch +++ b/target/linux/brcm63xx/patches-3.18/510-board_spw303v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -976,6 +976,21 @@ static struct board_info __initdata boar +@@ -1002,6 +1002,21 @@ static struct board_info __initdata boar .pci_dev = 1, }, }; @@ -22,7 +22,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1023,6 +1038,7 @@ static const struct board_info __initcon +@@ -1049,6 +1064,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_HW553, @@ -30,7 +30,7 @@ #endif }; -@@ -1074,6 +1090,7 @@ static struct of_device_id const bcm963x +@@ -1100,6 +1116,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch index 60fe53cb19..2d8951fc08 100644 --- a/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch +++ b/target/linux/brcm63xx/patches-3.18/511-board_V2500V.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -702,6 +702,27 @@ static struct board_info __initdata boar +@@ -720,6 +720,27 @@ static struct board_info __initdata boar .ext_irq = 2, }, }; @@ -28,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -1026,6 +1047,7 @@ static const struct board_info __initcon +@@ -1052,6 +1073,7 @@ static const struct board_info __initcon &board_96348_D4PW, &board_spw500v, &board_96348sv, @@ -36,7 +36,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1065,6 +1087,7 @@ static struct of_device_id const bcm963x +@@ -1091,6 +1113,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, @@ -44,7 +44,7 @@ { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, -@@ -1124,6 +1147,22 @@ void __init board_bcm963xx_init(void) +@@ -1150,6 +1173,22 @@ void __init board_bcm963xx_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); diff --git a/target/linux/brcm63xx/patches-3.18/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-3.18/512-board_BTV2110.patch index d316fd4b6a..1e1e8569bd 100644 --- a/target/linux/brcm63xx/patches-3.18/512-board_BTV2110.patch +++ b/target/linux/brcm63xx/patches-3.18/512-board_BTV2110.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -407,6 +407,25 @@ static struct board_info __initdata boar +@@ -415,6 +415,25 @@ static struct board_info __initdata boar }, }; @@ -26,7 +26,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -1048,6 +1067,7 @@ static const struct board_info __initcon +@@ -1074,6 +1093,7 @@ static const struct board_info __initcon &board_spw500v, &board_96348sv, &board_V2500V_BB, @@ -34,7 +34,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1087,6 +1107,7 @@ static struct of_device_id const bcm963x +@@ -1113,6 +1133,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, diff --git a/target/linux/brcm63xx/patches-3.18/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-3.18/514-board_ct536_ct5621.patch index a3ac4ced75..45c71aeda0 100644 --- a/target/linux/brcm63xx/patches-3.18/514-board_ct536_ct5621.patch +++ b/target/linux/brcm63xx/patches-3.18/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 -@@ -426,6 +426,34 @@ static struct board_info __initdata boar +@@ -434,6 +434,34 @@ static struct board_info __initdata boar }; @@ -35,7 +35,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -1068,6 +1096,7 @@ static const struct board_info __initcon +@@ -1094,6 +1122,7 @@ static const struct board_info __initcon &board_96348sv, &board_V2500V_BB, &board_V2110, @@ -43,7 +43,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1109,6 +1138,8 @@ static struct of_device_id const bcm963x +@@ -1135,6 +1164,8 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, { .compatible = "bt,v2110", .data = &board_V2110, }, { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, diff --git a/target/linux/brcm63xx/patches-3.18/515-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-3.18/515-board_DWV-S0_fixes.patch index 820a1e495b..9ed5eabdf5 100644 --- a/target/linux/brcm63xx/patches-3.18/515-board_DWV-S0_fixes.patch +++ b/target/linux/brcm63xx/patches-3.18/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 -@@ -926,6 +926,8 @@ static struct board_info __initdata boar +@@ -950,6 +950,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, -@@ -942,6 +944,7 @@ static struct board_info __initdata boar +@@ -968,6 +970,7 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, diff --git a/target/linux/brcm63xx/patches-3.18/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.18/516-board_96348A-122.patch index 3d68881c83..0df9bbb96f 100644 --- a/target/linux/brcm63xx/patches-3.18/516-board_96348A-122.patch +++ b/target/linux/brcm63xx/patches-3.18/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 -@@ -454,6 +454,31 @@ static struct board_info __initdata boar +@@ -462,6 +462,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -1100,6 +1125,7 @@ static const struct board_info __initcon +@@ -1126,6 +1151,7 @@ static const struct board_info __initcon &board_V2500V_BB, &board_V2110, &board_ct536_ct5621, @@ -40,7 +40,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1142,6 +1168,7 @@ static struct of_device_id const bcm963x +@@ -1168,6 +1194,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,v2110", .data = &board_V2110, }, { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, }, diff --git a/target/linux/brcm63xx/patches-3.18/517-RTA1205W_16_uart_fixes.patch b/target/linux/brcm63xx/patches-3.18/517-RTA1205W_16_uart_fixes.patch index af5b4837b8..5233faef57 100644 --- a/target/linux/brcm63xx/patches-3.18/517-RTA1205W_16_uart_fixes.patch +++ b/target/linux/brcm63xx/patches-3.18/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 -@@ -627,6 +627,7 @@ static struct board_info __initdata boar +@@ -639,6 +639,7 @@ static struct board_info __initdata boar .name = "RTA1025W_16", .expected_cpu_id = 0x6348, diff --git a/target/linux/brcm63xx/patches-3.18/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.18/519_board_CPVA502plus.patch index c6e4e376b9..f2e43244d7 100644 --- a/target/linux/brcm63xx/patches-3.18/519_board_CPVA502plus.patch +++ b/target/linux/brcm63xx/patches-3.18/519_board_CPVA502plus.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -425,6 +425,27 @@ static struct board_info __initdata boar +@@ -433,6 +433,27 @@ static struct board_info __initdata boar }, }; @@ -28,7 +28,7 @@ static struct board_info __initdata board_ct536_ct5621 = { .name = "CT536_CT5621", -@@ -1127,6 +1148,7 @@ static const struct board_info __initcon +@@ -1153,6 +1174,7 @@ static const struct board_info __initcon &board_V2110, &board_ct536_ct5621, &board_96348A_122, @@ -36,7 +36,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1179,6 +1201,7 @@ static struct of_device_id const bcm963x +@@ -1205,6 +1227,7 @@ static struct of_device_id const bcm963x { .compatible = "t-com,spw500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch index 4e9ce3b9dc..d7543fc809 100644 --- a/target/linux/brcm63xx/patches-3.18/520-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/brcm63xx/patches-3.18/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 -@@ -1112,6 +1112,59 @@ static struct board_info __initdata boar +@@ -1138,6 +1138,59 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6358 */ /* @@ -70,7 +70,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1163,6 +1216,10 @@ static const struct board_info __initcon +@@ -1189,6 +1242,10 @@ static const struct board_info __initcon &board_HW553, &board_spw303v, #endif @@ -81,7 +81,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1223,6 +1280,7 @@ static struct of_device_id const bcm963x +@@ -1249,6 +1306,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-3.18/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.18/521-bcm63xx-add-support-for-96368MVNgr-board.patch index 2914ef13c4..6ec6cf3363 100644 --- a/target/linux/brcm63xx/patches-3.18/521-bcm63xx-add-support-for-96368MVNgr-board.patch +++ b/target/linux/brcm63xx/patches-3.18/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 -@@ -1162,6 +1162,46 @@ static struct board_info __initdata boar +@@ -1188,6 +1188,46 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, }; @@ -56,7 +56,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1219,6 +1259,7 @@ static const struct board_info __initcon +@@ -1245,6 +1285,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, @@ -64,7 +64,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. #endif }; -@@ -1280,6 +1321,7 @@ static struct of_device_id const bcm963x +@@ -1306,6 +1347,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-3.18/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.18/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch index 9cc376229a..b01a0d4361 100644 --- a/target/linux/brcm63xx/patches-3.18/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/brcm63xx/patches-3.18/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -51,7 +51,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1240,6 +1275,7 @@ static const struct board_info __initcon +@@ -1266,6 +1301,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -59,7 +59,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1296,6 +1332,7 @@ static struct of_device_id const bcm963x +@@ -1322,6 +1358,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/brcm63xx/patches-3.18/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.18/524-board_dsl_274xb_rev_f.patch index 0428abe879..0d61f97377 100644 --- a/target/linux/brcm63xx/patches-3.18/524-board_dsl_274xb_rev_f.patch +++ b/target/linux/brcm63xx/patches-3.18/524-board_dsl_274xb_rev_f.patch @@ -62,7 +62,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1276,6 +1321,7 @@ static const struct board_info __initcon +@@ -1302,6 +1347,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -70,7 +70,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1334,6 +1380,7 @@ static struct of_device_id const bcm963x +@@ -1360,6 +1406,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-3.18/525-board_96348w3.patch b/target/linux/brcm63xx/patches-3.18/525-board_96348w3.patch index 1089eeda6d..8c8343353c 100644 --- a/target/linux/brcm63xx/patches-3.18/525-board_96348w3.patch +++ b/target/linux/brcm63xx/patches-3.18/525-board_96348w3.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -815,6 +815,25 @@ static struct board_info __initdata boar +@@ -833,6 +833,25 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -26,7 +26,7 @@ static struct board_info __initdata board_96348_D4PW = { .name = "D-4P-W", .expected_cpu_id = 0x6348, -@@ -1351,6 +1370,7 @@ static const struct board_info __initcon +@@ -1377,6 +1396,7 @@ static const struct board_info __initcon &board_ct536_ct5621, &board_96348A_122, &board_CPVA502plus, @@ -34,7 +34,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1406,6 +1426,7 @@ static struct of_device_id const bcm963x +@@ -1432,6 +1452,7 @@ static struct of_device_id const bcm963x { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, diff --git a/target/linux/brcm63xx/patches-3.18/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-3.18/526-board_CT6373-1.patch index 2300290ce2..3bd7eca49c 100644 --- a/target/linux/brcm63xx/patches-3.18/526-board_CT6373-1.patch +++ b/target/linux/brcm63xx/patches-3.18/526-board_CT6373-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1193,6 +1193,31 @@ static struct board_info __initdata boar +@@ -1219,6 +1219,31 @@ static struct board_info __initdata boar .num_usbh_ports = 2, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1382,6 +1407,7 @@ static const struct board_info __initcon +@@ -1408,6 +1433,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, @@ -40,7 +40,7 @@ &board_HW553, &board_spw303v, #endif -@@ -1440,6 +1466,7 @@ static struct of_device_id const bcm963x +@@ -1466,6 +1492,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-3.18/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.18/527-board_dva-g3810bn-tl-1.patch index db9b56e408..792f504c19 100644 --- a/target/linux/brcm63xx/patches-3.18/527-board_dva-g3810bn-tl-1.patch +++ b/target/linux/brcm63xx/patches-3.18/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 -@@ -1260,6 +1260,36 @@ static struct board_info __initdata boar +@@ -1286,6 +1286,36 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, }; @@ -37,7 +37,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1410,6 +1440,7 @@ static const struct board_info __initcon +@@ -1436,6 +1466,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, @@ -45,7 +45,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1469,6 +1500,7 @@ static struct of_device_id const bcm963x +@@ -1495,6 +1526,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-3.18/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.18/528-board_nb6.patch index d7600372af..173c2d26fd 100644 --- a/target/linux/brcm63xx/patches-3.18/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-3.18/528-board_nb6.patch @@ -19,7 +19,7 @@ /* * known 3368 boards */ -@@ -1292,6 +1297,69 @@ static struct board_info __initdata boar +@@ -1318,6 +1323,69 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -89,7 +89,7 @@ /* * known 6368 boards */ -@@ -1443,6 +1511,10 @@ static const struct board_info __initcon +@@ -1469,6 +1537,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -100,7 +100,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -1511,6 +1583,9 @@ static struct of_device_id const bcm963x +@@ -1537,6 +1609,9 @@ static struct of_device_id const bcm963x { .compatible = "t-com,spw303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif diff --git a/target/linux/brcm63xx/patches-3.18/529-board_fast2604.patch b/target/linux/brcm63xx/patches-3.18/529-board_fast2604.patch index fae52cb9e3..dc313255c1 100644 --- a/target/linux/brcm63xx/patches-3.18/529-board_fast2604.patch +++ b/target/linux/brcm63xx/patches-3.18/529-board_fast2604.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -756,6 +756,23 @@ static struct board_info __initdata boar +@@ -768,6 +768,23 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -24,7 +24,7 @@ static struct board_info __initdata board_rta1025w_16 = { .name = "RTA1025W_16", .expected_cpu_id = 0x6348, -@@ -1482,6 +1499,7 @@ static const struct board_info __initcon +@@ -1508,6 +1525,7 @@ static const struct board_info __initcon &board_96348gw_10, &board_96348gw_11, &board_FAST2404, @@ -32,7 +32,7 @@ &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, -@@ -1557,6 +1575,7 @@ static struct of_device_id const bcm963x +@@ -1583,6 +1601,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, diff --git a/target/linux/brcm63xx/patches-3.18/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-3.18/530-board_A4001N1.patch index 95d259516a..6ce857329d 100644 --- a/target/linux/brcm63xx/patches-3.18/530-board_A4001N1.patch +++ b/target/linux/brcm63xx/patches-3.18/530-board_A4001N1.patch @@ -51,7 +51,7 @@ static struct board_info __initdata board_dsl_274xb_f1 = { .name = "AW4339U", .expected_cpu_id = 0x6328, -@@ -1480,6 +1524,7 @@ static const struct board_info __initcon +@@ -1506,6 +1550,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -59,7 +59,7 @@ &board_dsl_274xb_f1, #endif #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1545,6 +1590,7 @@ static struct of_device_id const bcm963x +@@ -1571,6 +1616,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/brcm63xx/patches-3.18/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-3.18/531-board_AR-5387un.patch index 4b516574fa..000794a347 100644 --- a/target/linux/brcm63xx/patches-3.18/531-board_AR-5387un.patch +++ b/target/linux/brcm63xx/patches-3.18/531-board_AR-5387un.patch @@ -80,7 +80,7 @@ static struct board_info __initdata board_963281TAN = { .name = "963281TAN", .expected_cpu_id = 0x6328, -@@ -1523,6 +1596,7 @@ static const struct board_info __initcon +@@ -1549,6 +1622,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -88,7 +88,7 @@ &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, -@@ -1593,6 +1667,7 @@ static struct of_device_id const bcm963x +@@ -1619,6 +1693,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-3.18/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-3.18/532-board_AR-5381u.patch index 7ad4e56e44..3b79f0fcd9 100644 --- a/target/linux/brcm63xx/patches-3.18/532-board_AR-5381u.patch +++ b/target/linux/brcm63xx/patches-3.18/532-board_AR-5381u.patch @@ -62,7 +62,7 @@ static struct sprom_fixup __initdata ar5387un_fixups[] = { { .offset = 2, .value = 0x05bb }, { .offset = 65, .value = 0x1204 }, -@@ -1596,6 +1651,7 @@ static const struct board_info __initcon +@@ -1622,6 +1677,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -70,7 +70,7 @@ &board_AR5387un, &board_963281TAN, &board_A4001N1, -@@ -1667,6 +1723,7 @@ static struct of_device_id const bcm963x +@@ -1693,6 +1749,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-3.18/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.18/533-board_rta770bw.patch index 96e2f6a036..cbff51e16e 100644 --- a/target/linux/brcm63xx/patches-3.18/533-board_rta770bw.patch +++ b/target/linux/brcm63xx/patches-3.18/533-board_rta770bw.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -524,6 +524,22 @@ static struct board_info __initdata boar +@@ -528,6 +528,22 @@ static struct board_info __initdata boar .has_uart0 = 1, }; @@ -23,7 +23,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1665,6 +1681,7 @@ static const struct board_info __initcon +@@ -1691,6 +1707,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, @@ -31,7 +31,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1735,6 +1752,7 @@ static struct of_device_id const bcm963x +@@ -1761,6 +1778,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, diff --git a/target/linux/brcm63xx/patches-3.18/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.18/534-board_hw556.patch index 8541a65c65..85f2c3e4d5 100644 --- a/target/linux/brcm63xx/patches-3.18/534-board_hw556.patch +++ b/target/linux/brcm63xx/patches-3.18/534-board_hw556.patch @@ -8,7 +8,7 @@ #include <linux/platform_device.h> #include <linux/rtl8367.h> #include <asm/addrspace.h> -@@ -1456,6 +1457,93 @@ static struct board_info __initdata boar +@@ -1482,6 +1483,93 @@ static struct board_info __initdata boar }, }; @@ -102,7 +102,7 @@ /* T-Home Speedport W 303V Typ B */ static struct board_info __initdata board_spw303v = { .name = "96358-502V", -@@ -1717,6 +1805,9 @@ static const struct board_info __initcon +@@ -1743,6 +1831,9 @@ static const struct board_info __initcon &board_nb4_fxc_r1, &board_ct6373_1, &board_HW553, @@ -112,7 +112,7 @@ &board_spw303v, &board_DVAG3810BN, #endif -@@ -1789,6 +1880,9 @@ static struct of_device_id const bcm963x +@@ -1815,6 +1906,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, { .compatible = "huawei,hg553", .data = &board_HW553, }, diff --git a/target/linux/brcm63xx/patches-3.18/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.18/535-board_rta770w.patch index f9ce5bed56..06972998c8 100644 --- a/target/linux/brcm63xx/patches-3.18/535-board_rta770w.patch +++ b/target/linux/brcm63xx/patches-3.18/535-board_rta770w.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -541,6 +541,27 @@ static struct board_info __initdata boar +@@ -545,6 +545,27 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -28,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1770,6 +1791,7 @@ static const struct board_info __initcon +@@ -1796,6 +1817,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, &board_rta770bw, @@ -36,7 +36,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1844,6 +1866,7 @@ static struct of_device_id const bcm963x +@@ -1870,6 +1892,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, diff --git a/target/linux/brcm63xx/patches-3.18/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.18/536-board_fast2704.patch index 34b02f5ec0..6546e5de64 100644 --- a/target/linux/brcm63xx/patches-3.18/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-3.18/536-board_fast2704.patch @@ -57,7 +57,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com> #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1781,6 +1819,7 @@ static const struct board_info __initcon +@@ -1807,6 +1845,7 @@ static const struct board_info __initcon &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, @@ -65,7 +65,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com> #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1856,6 +1895,7 @@ static struct of_device_id const bcm963x +@@ -1882,6 +1921,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch index 1d70064202..b423df3bb1 100644 --- a/target/linux/brcm63xx/patches-3.18/537-board_fast2504n.patch +++ b/target/linux/brcm63xx/patches-3.18/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 -@@ -1710,6 +1710,43 @@ static struct board_info __initdata boar +@@ -1736,6 +1736,43 @@ static struct board_info __initdata boar .devs = nb6_devices, .num_devs = ARRAY_SIZE(nb6_devices), }; @@ -50,7 +50,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org> #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1875,6 +1912,7 @@ static const struct board_info __initcon +@@ -1901,6 +1938,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -58,7 +58,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org> #endif #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1956,6 +1994,7 @@ static struct of_device_id const bcm963x +@@ -1982,6 +2020,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/brcm63xx/patches-3.18/550-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/brcm63xx/patches-3.18/550-MIPS-BCM63XX-remove-leds-and-buttons.patch index 8ff7d5b8d9..4bd36958f5 100644 --- a/target/linux/brcm63xx/patches-3.18/550-MIPS-BCM63XX-remove-leds-and-buttons.patch +++ b/target/linux/brcm63xx/patches-3.18/550-MIPS-BCM63XX-remove-leds-and-buttons.patch @@ -60,7 +60,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons .has_enetsw = 1, .enetsw = { -@@ -451,35 +414,6 @@ static struct board_info __initdata boar +@@ -453,35 +416,6 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, @@ -96,7 +96,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96338w = { -@@ -492,35 +426,6 @@ static struct board_info __initdata boar +@@ -496,35 +430,6 @@ static struct board_info __initdata boar .force_speed_100 = 1, .force_duplex_full = 1, }, @@ -132,7 +132,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96338w2_e7t = { -@@ -619,36 +524,6 @@ static struct board_info __initdata boar +@@ -623,36 +528,6 @@ static struct board_info __initdata boar .has_phy = 1, .use_internal_phy = 1, }, @@ -169,7 +169,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96348gw_10 = { -@@ -681,35 +556,6 @@ static struct board_info __initdata boar +@@ -687,35 +562,6 @@ static struct board_info __initdata boar .cs = 2, .ext_irq = 2, }, @@ -205,7 +205,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96348gw_11 = { -@@ -736,35 +582,6 @@ static struct board_info __initdata boar +@@ -744,35 +590,6 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -241,7 +241,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; -@@ -888,35 +705,6 @@ static struct board_info __initdata boar +@@ -898,35 +715,6 @@ static struct board_info __initdata boar .ext_irq = 2, .cs = 2, }, @@ -277,7 +277,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_gw6200 = { -@@ -1243,33 +1031,6 @@ static struct board_info __initdata boar +@@ -1263,33 +1051,6 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -311,7 +311,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96358vw2 = { -@@ -1297,29 +1058,6 @@ static struct board_info __initdata boar +@@ -1319,29 +1080,6 @@ static struct board_info __initdata boar .has_pccard = 1, .has_ehci0 = 1, .num_usbh_ports = 2, diff --git a/target/linux/brcm63xx/patches-4.1/553-boards_probe_switch.patch b/target/linux/brcm63xx/patches-4.1/427-boards_probe_switch.patch index 0c1024bd2e..b813d098f8 100644 --- a/target/linux/brcm63xx/patches-4.1/553-boards_probe_switch.patch +++ b/target/linux/brcm63xx/patches-4.1/427-boards_probe_switch.patch @@ -1,17 +1,24 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -423,6 +423,10 @@ static struct board_info __initdata boar +@@ -123,6 +123,8 @@ static struct board_info __initdata boar .has_uart0 = 1, .has_enet0 = 1, .enet0 = { + .has_phy = 1, + .phy_id = 0, + .force_speed_100 = 1, + .force_duplex_full = 1, + }, +@@ -166,6 +168,8 @@ static struct board_info __initdata boar + .has_uart0 = 1, + .has_enet0 = 1, + .enet0 = { + .has_phy = 1, + .phy_id = 0, .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -541,6 +545,8 @@ static struct board_info __initdata boar +@@ -277,6 +281,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -20,7 +27,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -574,6 +580,8 @@ static struct board_info __initdata boar +@@ -339,6 +345,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -29,7 +36,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -721,6 +729,8 @@ static struct board_info __initdata boar +@@ -393,6 +401,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -38,7 +45,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -783,6 +793,8 @@ static struct board_info __initdata boar +@@ -453,6 +463,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -47,7 +54,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -824,6 +836,8 @@ static struct board_info __initdata boar +@@ -476,6 +488,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -56,7 +63,16 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -846,6 +860,8 @@ static struct board_info __initdata boar +@@ -495,6 +509,8 @@ static struct board_info __initdata boar + .has_enet1 = 1, + .enet0 = { + .has_phy = 1, ++ .phy_id = 0, ++ .has_phy = 1, + .use_internal_phy = 1, + }, + .enet1 = { +@@ -518,6 +534,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -65,16 +81,16 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -866,6 +882,8 @@ static struct board_info __initdata boar - .use_internal_phy = 1, +@@ -546,6 +564,8 @@ static struct board_info __initdata boar }, + .enet1 = { + .has_phy = 1, + .phy_id = 0, .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -1095,6 +1113,8 @@ static struct board_info __initdata boar +@@ -599,6 +619,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -83,14 +99,19 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -1120,6 +1140,12 @@ static struct board_info __initdata boar +@@ -648,6 +670,8 @@ static struct board_info __initdata boar }, .enet1 = { + .has_phy = 1, + .phy_id = 0, -+ .has_phy = 1, -+ .phy_id = 0, + .force_speed_100 = 1, + .force_duplex_full = 1, + }, +@@ -671,6 +695,8 @@ static struct board_info __initdata boar + }, + + .enet1 = { + .has_phy = 1, + .phy_id = 0, .force_speed_100 = 1, diff --git a/target/linux/brcm63xx/patches-4.1/499-allow_better_context_for_board_patches.patch b/target/linux/brcm63xx/patches-4.1/499-allow_better_context_for_board_patches.patch index de2012b16b..bf51de0361 100644 --- a/target/linux/brcm63xx/patches-4.1/499-allow_better_context_for_board_patches.patch +++ b/target/linux/brcm63xx/patches-4.1/499-allow_better_context_for_board_patches.patch @@ -18,7 +18,7 @@ /* * known 6338 boards -@@ -199,7 +199,7 @@ static struct board_info __initdata boar +@@ -203,7 +203,7 @@ static struct board_info __initdata boar }, }, }; @@ -27,7 +27,7 @@ /* * known 6345 boards -@@ -211,7 +211,7 @@ static struct board_info __initdata boar +@@ -215,7 +215,7 @@ static struct board_info __initdata boar .has_uart0 = 1, }; @@ -36,7 +36,7 @@ /* * known 6348 boards -@@ -524,7 +524,7 @@ static struct board_info __initdata boar +@@ -542,7 +542,7 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -45,7 +45,7 @@ /* * known 6358 boards -@@ -677,7 +677,7 @@ static struct board_info __initdata boar +@@ -703,7 +703,7 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; diff --git a/target/linux/brcm63xx/patches-4.1/500-board-D4PW.patch b/target/linux/brcm63xx/patches-4.1/500-board-D4PW.patch index e00e56499e..5a1a785504 100644 --- a/target/linux/brcm63xx/patches-4.1/500-board-D4PW.patch +++ b/target/linux/brcm63xx/patches-4.1/500-board-D4PW.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -524,6 +524,22 @@ static struct board_info __initdata boar +@@ -542,6 +542,22 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -23,7 +23,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -705,6 +721,7 @@ static const struct board_info __initcon +@@ -731,6 +747,7 @@ static const struct board_info __initcon &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, @@ -31,7 +31,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -736,6 +753,7 @@ static struct of_device_id const bcm963x +@@ -762,6 +779,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, diff --git a/target/linux/brcm63xx/patches-4.1/501-board-NB4.patch b/target/linux/brcm63xx/patches-4.1/501-board-NB4.patch index 97a9c73f85..79d638eb86 100644 --- a/target/linux/brcm63xx/patches-4.1/501-board-NB4.patch +++ b/target/linux/brcm63xx/patches-4.1/501-board-NB4.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -693,6 +693,62 @@ static struct board_info __initdata boar +@@ -719,6 +719,62 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -63,7 +63,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -729,6 +785,8 @@ static const struct board_info __initcon +@@ -755,6 +811,8 @@ static const struct board_info __initcon &board_96358vw2, &board_AGPFS0, &board_DWVS0, @@ -72,7 +72,7 @@ #endif }; -@@ -770,6 +828,8 @@ static struct of_device_id const bcm963x +@@ -796,6 +854,8 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, diff --git a/target/linux/brcm63xx/patches-4.1/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-4.1/502-board-96338W2_E7T.patch index cfdf03ec7e..f35b76a0b1 100644 --- a/target/linux/brcm63xx/patches-4.1/502-board-96338W2_E7T.patch +++ b/target/linux/brcm63xx/patches-4.1/502-board-96338W2_E7T.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -199,6 +199,20 @@ static struct board_info __initdata boar +@@ -203,6 +203,20 @@ static struct board_info __initdata boar }, }, }; @@ -21,7 +21,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -764,6 +778,7 @@ static const struct board_info __initcon +@@ -790,6 +804,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, &board_96338w, @@ -29,7 +29,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -801,6 +816,7 @@ static struct of_device_id const bcm963x +@@ -827,6 +842,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/brcm63xx/patches-4.1/503-board-CPVA642.patch b/target/linux/brcm63xx/patches-4.1/503-board-CPVA642.patch index c17b8e45be..a102380c64 100644 --- a/target/linux/brcm63xx/patches-4.1/503-board-CPVA642.patch +++ b/target/linux/brcm63xx/patches-4.1/503-board-CPVA642.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -663,6 +663,26 @@ static struct board_info __initdata boar +@@ -685,6 +685,26 @@ static struct board_info __initdata boar }, }; @@ -27,7 +27,7 @@ static struct board_info __initdata board_AGPFS0 = { .name = "AGPF-S0", .expected_cpu_id = 0x6358, -@@ -799,6 +819,7 @@ static const struct board_info __initcon +@@ -825,6 +845,7 @@ static const struct board_info __initcon &board_96358vw, &board_96358vw2, &board_AGPFS0, @@ -35,7 +35,7 @@ &board_DWVS0, &board_nb4_ser_r0, &board_nb4_fxc_r1, -@@ -846,6 +867,7 @@ static struct of_device_id const bcm963x +@@ -872,6 +893,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/brcm63xx/patches-4.1/504-board_dsl_274xb_rev_c.patch b/target/linux/brcm63xx/patches-4.1/504-board_dsl_274xb_rev_c.patch index 63c891be1a..2cc72664f0 100644 --- a/target/linux/brcm63xx/patches-4.1/504-board_dsl_274xb_rev_c.patch +++ b/target/linux/brcm63xx/patches-4.1/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 -@@ -728,6 +728,23 @@ static struct board_info __initdata boar +@@ -754,6 +754,23 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -24,7 +24,7 @@ static struct board_info __initdata board_nb4_ser_r0 = { .name = "NB4-SER-r0", .expected_cpu_id = 0x6358, -@@ -821,6 +838,7 @@ static const struct board_info __initcon +@@ -847,6 +864,7 @@ static const struct board_info __initcon &board_AGPFS0, &board_CPVA642, &board_DWVS0, @@ -32,7 +32,7 @@ &board_nb4_ser_r0, &board_nb4_fxc_r1, #endif -@@ -860,6 +878,7 @@ static struct of_device_id const bcm963x +@@ -886,6 +904,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-4.1/505-board_spw500v.patch b/target/linux/brcm63xx/patches-4.1/505-board_spw500v.patch index 8919e88748..bbc7f64035 100644 --- a/target/linux/brcm63xx/patches-4.1/505-board_spw500v.patch +++ b/target/linux/brcm63xx/patches-4.1/505-board_spw500v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -554,6 +554,45 @@ static struct board_info __initdata boar +@@ -572,6 +572,45 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -46,7 +46,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -830,6 +869,7 @@ static const struct board_info __initcon +@@ -856,6 +895,7 @@ static const struct board_info __initcon &board_96348gw_a, &board_rta1025w_16, &board_96348_D4PW, @@ -54,7 +54,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -871,6 +911,7 @@ static struct of_device_id const bcm963x +@@ -897,6 +937,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, diff --git a/target/linux/brcm63xx/patches-4.1/506-board_gw6200_gw6000.patch b/target/linux/brcm63xx/patches-4.1/506-board_gw6200_gw6000.patch index 8785db796a..6fc29df195 100644 --- a/target/linux/brcm63xx/patches-4.1/506-board_gw6200_gw6000.patch +++ b/target/linux/brcm63xx/patches-4.1/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 -@@ -451,6 +451,66 @@ static struct board_info __initdata boar +@@ -461,6 +461,66 @@ static struct board_info __initdata boar }, }; @@ -67,7 +67,7 @@ static struct board_info __initdata board_FAST2404 = { .name = "F@ST2404", .expected_cpu_id = 0x6348, -@@ -862,6 +922,8 @@ static const struct board_info __initcon +@@ -888,6 +948,8 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, &board_96348gw, @@ -76,7 +76,7 @@ &board_96348gw_10, &board_96348gw_11, &board_FAST2404, -@@ -912,6 +974,8 @@ static struct of_device_id const bcm963x +@@ -938,6 +1000,8 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, { .compatible = "t-com,spw500v", .data = &board_spw500v, }, diff --git a/target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch index 1d513ab3e4..cc4f6c2f74 100644 --- a/target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch +++ b/target/linux/brcm63xx/patches-4.1/507-board-MAGIC.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -653,6 +653,40 @@ static struct board_info __initdata boar +@@ -671,6 +671,40 @@ static struct board_info __initdata boar .num_board_fixups = ARRAY_SIZE(spw500v_fixups), }, }; @@ -41,7 +41,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -932,6 +966,7 @@ static const struct board_info __initcon +@@ -958,6 +992,7 @@ static const struct board_info __initcon &board_rta1025w_16, &board_96348_D4PW, &board_spw500v, @@ -49,7 +49,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -976,6 +1011,7 @@ static struct of_device_id const bcm963x +@@ -1002,6 +1037,7 @@ static struct of_device_id const bcm963x { .compatible = "t-com,spw500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/brcm63xx/patches-4.1/508-board_hw553.patch b/target/linux/brcm63xx/patches-4.1/508-board_hw553.patch index db0e7413fa..2d71babcb4 100644 --- a/target/linux/brcm63xx/patches-4.1/508-board_hw553.patch +++ b/target/linux/brcm63xx/patches-4.1/508-board_hw553.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -933,6 +933,34 @@ static struct board_info __initdata boar +@@ -959,6 +959,34 @@ static struct board_info __initdata boar .has_ehci0 = 1, .num_usbh_ports = 2, }; @@ -35,7 +35,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -978,6 +1006,7 @@ static const struct board_info __initcon +@@ -1004,6 +1032,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, @@ -43,7 +43,7 @@ #endif }; -@@ -1021,6 +1050,7 @@ static struct of_device_id const bcm963x +@@ -1047,6 +1076,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-4.1/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-4.1/509-board_rta1320_16m.patch index 9ca684477b..ced00bd893 100644 --- a/target/linux/brcm63xx/patches-4.1/509-board_rta1320_16m.patch +++ b/target/linux/brcm63xx/patches-4.1/509-board_rta1320_16m.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -213,6 +213,21 @@ static struct board_info __initdata boar +@@ -217,6 +217,21 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -22,7 +22,7 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -977,6 +992,7 @@ static const struct board_info __initcon +@@ -1003,6 +1018,7 @@ static const struct board_info __initcon &board_96338gw, &board_96338w, &board_96338w2_e7t, @@ -30,7 +30,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -1021,6 +1037,7 @@ static struct of_device_id const bcm963x +@@ -1047,6 +1063,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/brcm63xx/patches-4.1/510-board_spw303v.patch b/target/linux/brcm63xx/patches-4.1/510-board_spw303v.patch index 1e6da541e5..f903bfc150 100644 --- a/target/linux/brcm63xx/patches-4.1/510-board_spw303v.patch +++ b/target/linux/brcm63xx/patches-4.1/510-board_spw303v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -976,6 +976,21 @@ static struct board_info __initdata boar +@@ -1002,6 +1002,21 @@ static struct board_info __initdata boar .pci_dev = 1, }, }; @@ -22,7 +22,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1023,6 +1038,7 @@ static const struct board_info __initcon +@@ -1049,6 +1064,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_HW553, @@ -30,7 +30,7 @@ #endif }; -@@ -1074,6 +1090,7 @@ static struct of_device_id const bcm963x +@@ -1100,6 +1116,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/brcm63xx/patches-4.1/511-board_V2500V.patch b/target/linux/brcm63xx/patches-4.1/511-board_V2500V.patch index 60fe53cb19..2d8951fc08 100644 --- a/target/linux/brcm63xx/patches-4.1/511-board_V2500V.patch +++ b/target/linux/brcm63xx/patches-4.1/511-board_V2500V.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -702,6 +702,27 @@ static struct board_info __initdata boar +@@ -720,6 +720,27 @@ static struct board_info __initdata boar .ext_irq = 2, }, }; @@ -28,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -1026,6 +1047,7 @@ static const struct board_info __initcon +@@ -1052,6 +1073,7 @@ static const struct board_info __initcon &board_96348_D4PW, &board_spw500v, &board_96348sv, @@ -36,7 +36,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1065,6 +1087,7 @@ static struct of_device_id const bcm963x +@@ -1091,6 +1113,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, @@ -44,7 +44,7 @@ { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, -@@ -1124,6 +1147,22 @@ void __init board_bcm963xx_init(void) +@@ -1150,6 +1173,22 @@ void __init board_bcm963xx_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); diff --git a/target/linux/brcm63xx/patches-4.1/512-board_BTV2110.patch b/target/linux/brcm63xx/patches-4.1/512-board_BTV2110.patch index d316fd4b6a..1e1e8569bd 100644 --- a/target/linux/brcm63xx/patches-4.1/512-board_BTV2110.patch +++ b/target/linux/brcm63xx/patches-4.1/512-board_BTV2110.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -407,6 +407,25 @@ static struct board_info __initdata boar +@@ -415,6 +415,25 @@ static struct board_info __initdata boar }, }; @@ -26,7 +26,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -1048,6 +1067,7 @@ static const struct board_info __initcon +@@ -1074,6 +1093,7 @@ static const struct board_info __initcon &board_spw500v, &board_96348sv, &board_V2500V_BB, @@ -34,7 +34,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1087,6 +1107,7 @@ static struct of_device_id const bcm963x +@@ -1113,6 +1133,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, diff --git a/target/linux/brcm63xx/patches-4.1/514-board_ct536_ct5621.patch b/target/linux/brcm63xx/patches-4.1/514-board_ct536_ct5621.patch index a3ac4ced75..45c71aeda0 100644 --- a/target/linux/brcm63xx/patches-4.1/514-board_ct536_ct5621.patch +++ b/target/linux/brcm63xx/patches-4.1/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 -@@ -426,6 +426,34 @@ static struct board_info __initdata boar +@@ -434,6 +434,34 @@ static struct board_info __initdata boar }; @@ -35,7 +35,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -1068,6 +1096,7 @@ static const struct board_info __initcon +@@ -1094,6 +1122,7 @@ static const struct board_info __initcon &board_96348sv, &board_V2500V_BB, &board_V2110, @@ -43,7 +43,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1109,6 +1138,8 @@ static struct of_device_id const bcm963x +@@ -1135,6 +1164,8 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, { .compatible = "bt,v2110", .data = &board_V2110, }, { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, diff --git a/target/linux/brcm63xx/patches-4.1/515-board_DWV-S0_fixes.patch b/target/linux/brcm63xx/patches-4.1/515-board_DWV-S0_fixes.patch index 820a1e495b..9ed5eabdf5 100644 --- a/target/linux/brcm63xx/patches-4.1/515-board_DWV-S0_fixes.patch +++ b/target/linux/brcm63xx/patches-4.1/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 -@@ -926,6 +926,8 @@ static struct board_info __initdata boar +@@ -950,6 +950,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, -@@ -942,6 +944,7 @@ static struct board_info __initdata boar +@@ -968,6 +970,7 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, diff --git a/target/linux/brcm63xx/patches-4.1/516-board_96348A-122.patch b/target/linux/brcm63xx/patches-4.1/516-board_96348A-122.patch index 3d68881c83..0df9bbb96f 100644 --- a/target/linux/brcm63xx/patches-4.1/516-board_96348A-122.patch +++ b/target/linux/brcm63xx/patches-4.1/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 -@@ -454,6 +454,31 @@ static struct board_info __initdata boar +@@ -462,6 +462,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -1100,6 +1125,7 @@ static const struct board_info __initcon +@@ -1126,6 +1151,7 @@ static const struct board_info __initcon &board_V2500V_BB, &board_V2110, &board_ct536_ct5621, @@ -40,7 +40,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1142,6 +1168,7 @@ static struct of_device_id const bcm963x +@@ -1168,6 +1194,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,v2110", .data = &board_V2110, }, { .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, }, { .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, }, diff --git a/target/linux/brcm63xx/patches-4.1/517-RTA1205W_16_uart_fixes.patch b/target/linux/brcm63xx/patches-4.1/517-RTA1205W_16_uart_fixes.patch index af5b4837b8..5233faef57 100644 --- a/target/linux/brcm63xx/patches-4.1/517-RTA1205W_16_uart_fixes.patch +++ b/target/linux/brcm63xx/patches-4.1/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 -@@ -627,6 +627,7 @@ static struct board_info __initdata boar +@@ -639,6 +639,7 @@ static struct board_info __initdata boar .name = "RTA1025W_16", .expected_cpu_id = 0x6348, diff --git a/target/linux/brcm63xx/patches-4.1/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-4.1/519_board_CPVA502plus.patch index c6e4e376b9..f2e43244d7 100644 --- a/target/linux/brcm63xx/patches-4.1/519_board_CPVA502plus.patch +++ b/target/linux/brcm63xx/patches-4.1/519_board_CPVA502plus.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -425,6 +425,27 @@ static struct board_info __initdata boar +@@ -433,6 +433,27 @@ static struct board_info __initdata boar }, }; @@ -28,7 +28,7 @@ static struct board_info __initdata board_ct536_ct5621 = { .name = "CT536_CT5621", -@@ -1127,6 +1148,7 @@ static const struct board_info __initcon +@@ -1153,6 +1174,7 @@ static const struct board_info __initcon &board_V2110, &board_ct536_ct5621, &board_96348A_122, @@ -36,7 +36,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1179,6 +1201,7 @@ static struct of_device_id const bcm963x +@@ -1205,6 +1227,7 @@ static struct of_device_id const bcm963x { .compatible = "t-com,spw500v", .data = &board_spw500v, }, { .compatible = "tecom,gw6000", .data = &board_gw6000, }, { .compatible = "tecom,gw6200", .data = &board_gw6200, }, diff --git a/target/linux/brcm63xx/patches-4.1/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-4.1/520-bcm63xx-add-support-for-96368MVWG-board.patch index 4e9ce3b9dc..d7543fc809 100644 --- a/target/linux/brcm63xx/patches-4.1/520-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/brcm63xx/patches-4.1/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 -@@ -1112,6 +1112,59 @@ static struct board_info __initdata boar +@@ -1138,6 +1138,59 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6358 */ /* @@ -70,7 +70,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1163,6 +1216,10 @@ static const struct board_info __initcon +@@ -1189,6 +1242,10 @@ static const struct board_info __initcon &board_HW553, &board_spw303v, #endif @@ -81,7 +81,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1223,6 +1280,7 @@ static struct of_device_id const bcm963x +@@ -1249,6 +1306,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.1/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-4.1/521-bcm63xx-add-support-for-96368MVNgr-board.patch index 2914ef13c4..6ec6cf3363 100644 --- a/target/linux/brcm63xx/patches-4.1/521-bcm63xx-add-support-for-96368MVNgr-board.patch +++ b/target/linux/brcm63xx/patches-4.1/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 -@@ -1162,6 +1162,46 @@ static struct board_info __initdata boar +@@ -1188,6 +1188,46 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, }; @@ -56,7 +56,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1219,6 +1259,7 @@ static const struct board_info __initcon +@@ -1245,6 +1285,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, @@ -64,7 +64,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. #endif }; -@@ -1280,6 +1321,7 @@ static struct of_device_id const bcm963x +@@ -1306,6 +1347,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/brcm63xx/patches-4.1/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-4.1/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch index 9cc376229a..b01a0d4361 100644 --- a/target/linux/brcm63xx/patches-4.1/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/brcm63xx/patches-4.1/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -51,7 +51,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1240,6 +1275,7 @@ static const struct board_info __initcon +@@ -1266,6 +1301,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -59,7 +59,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1296,6 +1332,7 @@ static struct of_device_id const bcm963x +@@ -1322,6 +1358,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/brcm63xx/patches-4.1/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-4.1/524-board_dsl_274xb_rev_f.patch index 0428abe879..0d61f97377 100644 --- a/target/linux/brcm63xx/patches-4.1/524-board_dsl_274xb_rev_f.patch +++ b/target/linux/brcm63xx/patches-4.1/524-board_dsl_274xb_rev_f.patch @@ -62,7 +62,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1276,6 +1321,7 @@ static const struct board_info __initcon +@@ -1302,6 +1347,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -70,7 +70,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1334,6 +1380,7 @@ static struct of_device_id const bcm963x +@@ -1360,6 +1406,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-4.1/525-board_96348w3.patch b/target/linux/brcm63xx/patches-4.1/525-board_96348w3.patch index 1089eeda6d..8c8343353c 100644 --- a/target/linux/brcm63xx/patches-4.1/525-board_96348w3.patch +++ b/target/linux/brcm63xx/patches-4.1/525-board_96348w3.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -815,6 +815,25 @@ static struct board_info __initdata boar +@@ -833,6 +833,25 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -26,7 +26,7 @@ static struct board_info __initdata board_96348_D4PW = { .name = "D-4P-W", .expected_cpu_id = 0x6348, -@@ -1351,6 +1370,7 @@ static const struct board_info __initcon +@@ -1377,6 +1396,7 @@ static const struct board_info __initcon &board_ct536_ct5621, &board_96348A_122, &board_CPVA502plus, @@ -34,7 +34,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1406,6 +1426,7 @@ static struct of_device_id const bcm963x +@@ -1432,6 +1452,7 @@ static struct of_device_id const bcm963x { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, diff --git a/target/linux/brcm63xx/patches-4.1/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-4.1/526-board_CT6373-1.patch index 2300290ce2..3bd7eca49c 100644 --- a/target/linux/brcm63xx/patches-4.1/526-board_CT6373-1.patch +++ b/target/linux/brcm63xx/patches-4.1/526-board_CT6373-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1193,6 +1193,31 @@ static struct board_info __initdata boar +@@ -1219,6 +1219,31 @@ static struct board_info __initdata boar .num_usbh_ports = 2, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1382,6 +1407,7 @@ static const struct board_info __initcon +@@ -1408,6 +1433,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, @@ -40,7 +40,7 @@ &board_HW553, &board_spw303v, #endif -@@ -1440,6 +1466,7 @@ static struct of_device_id const bcm963x +@@ -1466,6 +1492,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-4.1/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-4.1/527-board_dva-g3810bn-tl-1.patch index db9b56e408..792f504c19 100644 --- a/target/linux/brcm63xx/patches-4.1/527-board_dva-g3810bn-tl-1.patch +++ b/target/linux/brcm63xx/patches-4.1/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 -@@ -1260,6 +1260,36 @@ static struct board_info __initdata boar +@@ -1286,6 +1286,36 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, }; @@ -37,7 +37,7 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1410,6 +1440,7 @@ static const struct board_info __initcon +@@ -1436,6 +1466,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, @@ -45,7 +45,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1469,6 +1500,7 @@ static struct of_device_id const bcm963x +@@ -1495,6 +1526,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/brcm63xx/patches-4.1/528-board_nb6.patch b/target/linux/brcm63xx/patches-4.1/528-board_nb6.patch index d7600372af..173c2d26fd 100644 --- a/target/linux/brcm63xx/patches-4.1/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-4.1/528-board_nb6.patch @@ -19,7 +19,7 @@ /* * known 3368 boards */ -@@ -1292,6 +1297,69 @@ static struct board_info __initdata boar +@@ -1318,6 +1323,69 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -89,7 +89,7 @@ /* * known 6368 boards */ -@@ -1443,6 +1511,10 @@ static const struct board_info __initcon +@@ -1469,6 +1537,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -100,7 +100,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -1511,6 +1583,9 @@ static struct of_device_id const bcm963x +@@ -1537,6 +1609,9 @@ static struct of_device_id const bcm963x { .compatible = "t-com,spw303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif diff --git a/target/linux/brcm63xx/patches-4.1/529-board_fast2604.patch b/target/linux/brcm63xx/patches-4.1/529-board_fast2604.patch index fae52cb9e3..dc313255c1 100644 --- a/target/linux/brcm63xx/patches-4.1/529-board_fast2604.patch +++ b/target/linux/brcm63xx/patches-4.1/529-board_fast2604.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -756,6 +756,23 @@ static struct board_info __initdata boar +@@ -768,6 +768,23 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -24,7 +24,7 @@ static struct board_info __initdata board_rta1025w_16 = { .name = "RTA1025W_16", .expected_cpu_id = 0x6348, -@@ -1482,6 +1499,7 @@ static const struct board_info __initcon +@@ -1508,6 +1525,7 @@ static const struct board_info __initcon &board_96348gw_10, &board_96348gw_11, &board_FAST2404, @@ -32,7 +32,7 @@ &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, -@@ -1557,6 +1575,7 @@ static struct of_device_id const bcm963x +@@ -1583,6 +1601,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, { .compatible = "sagem,f@st2404", .data = &board_FAST2404, }, diff --git a/target/linux/brcm63xx/patches-4.1/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-4.1/530-board_A4001N1.patch index 95d259516a..6ce857329d 100644 --- a/target/linux/brcm63xx/patches-4.1/530-board_A4001N1.patch +++ b/target/linux/brcm63xx/patches-4.1/530-board_A4001N1.patch @@ -51,7 +51,7 @@ static struct board_info __initdata board_dsl_274xb_f1 = { .name = "AW4339U", .expected_cpu_id = 0x6328, -@@ -1480,6 +1524,7 @@ static const struct board_info __initcon +@@ -1506,6 +1550,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, @@ -59,7 +59,7 @@ &board_dsl_274xb_f1, #endif #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1545,6 +1590,7 @@ static struct of_device_id const bcm963x +@@ -1571,6 +1616,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/brcm63xx/patches-4.1/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-4.1/531-board_AR-5387un.patch index 4b516574fa..000794a347 100644 --- a/target/linux/brcm63xx/patches-4.1/531-board_AR-5387un.patch +++ b/target/linux/brcm63xx/patches-4.1/531-board_AR-5387un.patch @@ -80,7 +80,7 @@ static struct board_info __initdata board_963281TAN = { .name = "963281TAN", .expected_cpu_id = 0x6328, -@@ -1523,6 +1596,7 @@ static const struct board_info __initcon +@@ -1549,6 +1622,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -88,7 +88,7 @@ &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, -@@ -1593,6 +1667,7 @@ static struct of_device_id const bcm963x +@@ -1619,6 +1693,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-4.1/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-4.1/532-board_AR-5381u.patch index 7ad4e56e44..3b79f0fcd9 100644 --- a/target/linux/brcm63xx/patches-4.1/532-board_AR-5381u.patch +++ b/target/linux/brcm63xx/patches-4.1/532-board_AR-5381u.patch @@ -62,7 +62,7 @@ static struct sprom_fixup __initdata ar5387un_fixups[] = { { .offset = 2, .value = 0x05bb }, { .offset = 65, .value = 0x1204 }, -@@ -1596,6 +1651,7 @@ static const struct board_info __initcon +@@ -1622,6 +1677,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -70,7 +70,7 @@ &board_AR5387un, &board_963281TAN, &board_A4001N1, -@@ -1667,6 +1723,7 @@ static struct of_device_id const bcm963x +@@ -1693,6 +1749,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/brcm63xx/patches-4.1/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-4.1/533-board_rta770bw.patch index 96e2f6a036..cbff51e16e 100644 --- a/target/linux/brcm63xx/patches-4.1/533-board_rta770bw.patch +++ b/target/linux/brcm63xx/patches-4.1/533-board_rta770bw.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -524,6 +524,22 @@ static struct board_info __initdata boar +@@ -528,6 +528,22 @@ static struct board_info __initdata boar .has_uart0 = 1, }; @@ -23,7 +23,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1665,6 +1681,7 @@ static const struct board_info __initcon +@@ -1691,6 +1707,7 @@ static const struct board_info __initcon #endif #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, @@ -31,7 +31,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1735,6 +1752,7 @@ static struct of_device_id const bcm963x +@@ -1761,6 +1778,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, diff --git a/target/linux/brcm63xx/patches-4.1/534-board_hw556.patch b/target/linux/brcm63xx/patches-4.1/534-board_hw556.patch index 8541a65c65..85f2c3e4d5 100644 --- a/target/linux/brcm63xx/patches-4.1/534-board_hw556.patch +++ b/target/linux/brcm63xx/patches-4.1/534-board_hw556.patch @@ -8,7 +8,7 @@ #include <linux/platform_device.h> #include <linux/rtl8367.h> #include <asm/addrspace.h> -@@ -1456,6 +1457,93 @@ static struct board_info __initdata boar +@@ -1482,6 +1483,93 @@ static struct board_info __initdata boar }, }; @@ -102,7 +102,7 @@ /* T-Home Speedport W 303V Typ B */ static struct board_info __initdata board_spw303v = { .name = "96358-502V", -@@ -1717,6 +1805,9 @@ static const struct board_info __initcon +@@ -1743,6 +1831,9 @@ static const struct board_info __initcon &board_nb4_fxc_r1, &board_ct6373_1, &board_HW553, @@ -112,7 +112,7 @@ &board_spw303v, &board_DVAG3810BN, #endif -@@ -1789,6 +1880,9 @@ static struct of_device_id const bcm963x +@@ -1815,6 +1906,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, }, { .compatible = "huawei,hg553", .data = &board_HW553, }, diff --git a/target/linux/brcm63xx/patches-4.1/535-board_rta770w.patch b/target/linux/brcm63xx/patches-4.1/535-board_rta770w.patch index f9ce5bed56..06972998c8 100644 --- a/target/linux/brcm63xx/patches-4.1/535-board_rta770w.patch +++ b/target/linux/brcm63xx/patches-4.1/535-board_rta770w.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -541,6 +541,27 @@ static struct board_info __initdata boar +@@ -545,6 +545,27 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -28,7 +28,7 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1770,6 +1791,7 @@ static const struct board_info __initcon +@@ -1796,6 +1817,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, &board_rta770bw, @@ -36,7 +36,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1844,6 +1866,7 @@ static struct of_device_id const bcm963x +@@ -1870,6 +1892,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, diff --git a/target/linux/brcm63xx/patches-4.1/536-board_fast2704.patch b/target/linux/brcm63xx/patches-4.1/536-board_fast2704.patch index 34b02f5ec0..6546e5de64 100644 --- a/target/linux/brcm63xx/patches-4.1/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-4.1/536-board_fast2704.patch @@ -57,7 +57,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com> #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1781,6 +1819,7 @@ static const struct board_info __initcon +@@ -1807,6 +1845,7 @@ static const struct board_info __initcon &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, @@ -65,7 +65,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com> #endif #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1856,6 +1895,7 @@ static struct of_device_id const bcm963x +@@ -1882,6 +1921,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/brcm63xx/patches-4.1/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-4.1/537-board_fast2504n.patch index 1d70064202..b423df3bb1 100644 --- a/target/linux/brcm63xx/patches-4.1/537-board_fast2504n.patch +++ b/target/linux/brcm63xx/patches-4.1/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 -@@ -1710,6 +1710,43 @@ static struct board_info __initdata boar +@@ -1736,6 +1736,43 @@ static struct board_info __initdata boar .devs = nb6_devices, .num_devs = ARRAY_SIZE(nb6_devices), }; @@ -50,7 +50,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org> #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1875,6 +1912,7 @@ static const struct board_info __initcon +@@ -1901,6 +1938,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -58,7 +58,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org> #endif #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1956,6 +1994,7 @@ static struct of_device_id const bcm963x +@@ -1982,6 +2020,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/brcm63xx/patches-4.1/550-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/brcm63xx/patches-4.1/550-MIPS-BCM63XX-remove-leds-and-buttons.patch index 8ff7d5b8d9..4bd36958f5 100644 --- a/target/linux/brcm63xx/patches-4.1/550-MIPS-BCM63XX-remove-leds-and-buttons.patch +++ b/target/linux/brcm63xx/patches-4.1/550-MIPS-BCM63XX-remove-leds-and-buttons.patch @@ -60,7 +60,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons .has_enetsw = 1, .enetsw = { -@@ -451,35 +414,6 @@ static struct board_info __initdata boar +@@ -453,35 +416,6 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, @@ -96,7 +96,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96338w = { -@@ -492,35 +426,6 @@ static struct board_info __initdata boar +@@ -496,35 +430,6 @@ static struct board_info __initdata boar .force_speed_100 = 1, .force_duplex_full = 1, }, @@ -132,7 +132,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96338w2_e7t = { -@@ -619,36 +524,6 @@ static struct board_info __initdata boar +@@ -623,36 +528,6 @@ static struct board_info __initdata boar .has_phy = 1, .use_internal_phy = 1, }, @@ -169,7 +169,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96348gw_10 = { -@@ -681,35 +556,6 @@ static struct board_info __initdata boar +@@ -687,35 +562,6 @@ static struct board_info __initdata boar .cs = 2, .ext_irq = 2, }, @@ -205,7 +205,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96348gw_11 = { -@@ -736,35 +582,6 @@ static struct board_info __initdata boar +@@ -744,35 +590,6 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -241,7 +241,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; -@@ -888,35 +705,6 @@ static struct board_info __initdata boar +@@ -898,35 +715,6 @@ static struct board_info __initdata boar .ext_irq = 2, .cs = 2, }, @@ -277,7 +277,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_gw6200 = { -@@ -1243,33 +1031,6 @@ static struct board_info __initdata boar +@@ -1263,33 +1051,6 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -311,7 +311,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96358vw2 = { -@@ -1297,29 +1058,6 @@ static struct board_info __initdata boar +@@ -1319,29 +1080,6 @@ static struct board_info __initdata boar .has_pccard = 1, .has_ehci0 = 1, .num_usbh_ports = 2, |