OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 2 Rev 3
1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
3 @@ -968,6 +968,32 @@ static struct board_info __initdata boar 3 @@ -1016,6 +1016,32 @@ static struct board_info __initdata boar
4 }; 4 };
5 #endif /* CONFIG_BCM63XX_CPU_6358 */ 5 #endif /* CONFIG_BCM63XX_CPU_6358 */
6 6
7 +#ifdef CONFIG_BCM63XX_CPU_6362 7 +#ifdef CONFIG_BCM63XX_CPU_6362
8 +static struct board_info __initdata board_nb6 = { 8 +static struct board_info __initdata board_nb6 = {
9 + .name = "NB6", 9 + .name = "NB6",
10 + .expected_cpu_id = 0x6362, 10 + .expected_cpu_id = 0x6362,
11 + 11 +
12 + .has_ohci0 = 1, 12 + .has_ohci0 = 1,
13 + .has_ehci0 = 1, 13 + .has_ehci0 = 1,
14 + .num_usbh_ports = 2, 14 + .num_usbh_ports = 2,
15 + 15 +
16 + .has_enetsw = 1, 16 + .has_enetsw = 1,
17 + 17 +
18 + .enetsw = { 18 + .enetsw = {
19 + .used_ports = { 19 + .used_ports = {
20 + [4] = { 20 + [4] = {
21 + .used = 1, 21 + .used = 1,
22 + .phy_id = 0xff, 22 + .phy_id = 0xff,
23 + .bypass_link = 1, 23 + .bypass_link = 1,
24 + .force_speed = 1000, 24 + .force_speed = 1000,
25 + .force_duplex_full = 1, 25 + .force_duplex_full = 1,
26 + .name = "RGMII", 26 + .name = "RGMII",
27 + }, 27 + },
28 + }, 28 + },
29 + }, 29 + },
30 +}; 30 +};
31 +#endif /* CONFIG_BCM63XX_CPU_6362 */ 31 +#endif /* CONFIG_BCM63XX_CPU_6362 */
32 + 32 +
33 /* 33 /*
34 * known 6368 boards 34 * known 6368 boards
35 */ 35 */
36 @@ -1117,6 +1143,10 @@ static const struct board_info __initcon 36 @@ -1165,6 +1191,10 @@ static const struct board_info __initcon
37 &board_DVAG3810BN, 37 &board_DVAG3810BN,
38 #endif 38 #endif
39 39
40 +#ifdef CONFIG_BCM63XX_CPU_6362 40 +#ifdef CONFIG_BCM63XX_CPU_6362
41 + &board_nb6, 41 + &board_nb6,
42 +#endif 42 +#endif
43 + 43 +
44 #ifdef CONFIG_BCM63XX_CPU_6368 44 #ifdef CONFIG_BCM63XX_CPU_6368
45 &board_96368mvwg, 45 &board_96368mvwg,
46 &board_96368mvngr, 46 &board_96368mvngr,
47 @@ -1185,6 +1215,9 @@ static struct of_device_id const bcm963x 47 @@ -1233,6 +1263,9 @@ static struct of_device_id const bcm963x
48 { .compatible = "t-com,spw303v", .data = &board_spw303v, }, 48 { .compatible = "t-com,spw303v", .data = &board_spw303v, },
49 { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, 49 { .compatible = "telsey,cpva642", .data = &board_CPVA642, },
50 #endif 50 #endif
51 +#ifdef CONFIG_BCM63XX_CPU_6362 51 +#ifdef CONFIG_BCM63XX_CPU_6362
52 + { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, }, 52 + { .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, },
53 +#endif 53 +#endif
54 #ifdef CONFIG_BCM63XX_CPU_6368 54 #ifdef CONFIG_BCM63XX_CPU_6368
55 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, 55 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
56 { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, 56 { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
57   57