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 @@ -1574,6 +1574,64 @@ static struct board_info __initdata boar 3 @@ -1622,6 +1622,64 @@ static struct board_info __initdata boar
4 * known 63268/63269 boards 4 * known 63268/63269 boards
5 */ 5 */
6 #ifdef CONFIG_BCM63XX_CPU_63268 6 #ifdef CONFIG_BCM63XX_CPU_63268
7 +static struct board_info __initdata board_963268bu_p300 = { 7 +static struct board_info __initdata board_963268bu_p300 = {
8 + .name = "963268BU_P300", 8 + .name = "963268BU_P300",
9 + .expected_cpu_id = 0x63268, 9 + .expected_cpu_id = 0x63268,
10 + 10 +
11 + .has_ehci0 = 1, 11 + .has_ehci0 = 1,
12 + .has_ohci0 = 1, 12 + .has_ohci0 = 1,
13 + .num_usbh_ports = 1, 13 + .num_usbh_ports = 1,
14 + 14 +
15 + .has_usbd = 1, 15 + .has_usbd = 1,
16 + 16 +
17 + .usbd = { 17 + .usbd = {
18 + .use_fullspeed = 0, 18 + .use_fullspeed = 0,
19 + .port_no = 0, 19 + .port_no = 0,
20 + }, 20 + },
21 + 21 +
22 + .has_enetsw = 1, 22 + .has_enetsw = 1,
23 + 23 +
24 + .enetsw = { 24 + .enetsw = {
25 + .used_ports = { 25 + .used_ports = {
26 + [0] = { 26 + [0] = {
27 + .used = 1, 27 + .used = 1,
28 + .phy_id = 17, 28 + .phy_id = 17,
29 + .name = "FE1", 29 + .name = "FE1",
30 + }, 30 + },
31 + 31 +
32 + [3] = { 32 + [3] = {
33 + .used = 1, 33 + .used = 1,
34 + .phy_id = 4, 34 + .phy_id = 4,
35 + .name = "GbE2", 35 + .name = "GbE2",
36 + }, 36 + },
37 + 37 +
38 + [4] = { 38 + [4] = {
39 + .used = 1, 39 + .used = 1,
40 + .phy_id = 0, 40 + .phy_id = 0,
41 + .name = "GbE3", 41 + .name = "GbE3",
42 + }, 42 + },
43 + 43 +
44 + [5] = { 44 + [5] = {
45 + .used = 1, 45 + .used = 1,
46 + .phy_id = 1, 46 + .phy_id = 1,
47 + .name = "GbE1", 47 + .name = "GbE1",
48 + }, 48 + },
49 + 49 +
50 + [6] = { 50 + [6] = {
51 + .used = 1, 51 + .used = 1,
52 + .phy_id = 24, 52 + .phy_id = 24,
53 + .name = "GbE4", 53 + .name = "GbE4",
54 + }, 54 + },
55 + 55 +
56 + [7] = { 56 + [7] = {
57 + .used = 1, 57 + .used = 1,
58 + .phy_id = 25, 58 + .phy_id = 25,
59 + .name = "GbE5", 59 + .name = "GbE5",
60 + }, 60 + },
61 + }, 61 + },
62 + }, 62 + },
63 +}; 63 +};
64 + 64 +
65 static struct board_info __initdata board_963269bhr = { 65 static struct board_info __initdata board_963269bhr = {
66 .name = "963269BHR", 66 .name = "963269BHR",
67 .expected_cpu_id = 0x63268, 67 .expected_cpu_id = 0x63268,
68 @@ -1742,6 +1800,7 @@ static const struct board_info __initcon 68 @@ -1790,6 +1848,7 @@ static const struct board_info __initcon
69 &board_96368mvngr, 69 &board_96368mvngr,
70 #endif 70 #endif
71 #ifdef CONFIG_BCM63XX_CPU_63268 71 #ifdef CONFIG_BCM63XX_CPU_63268
72 + &board_963268bu_p300, 72 + &board_963268bu_p300,
73 &board_963269bhr, 73 &board_963269bhr,
74 &board_vw6339gu, 74 &board_vw6339gu,
75 #endif 75 #endif
76 @@ -1833,6 +1892,7 @@ static struct of_device_id const bcm963x 76 @@ -1881,6 +1940,7 @@ static struct of_device_id const bcm963x
77 { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, 77 { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
78 #endif 78 #endif
79 #ifdef CONFIG_BCM63XX_CPU_63268 79 #ifdef CONFIG_BCM63XX_CPU_63268
80 + { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, }, 80 + { .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, },
81 { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, 81 { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
82 { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, 82 { .compatible = "inteno,vg50", .data = &board_vw6339gu, },
83 #endif 83 #endif
84   84