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 @@ -1571,6 +1571,59 @@ static struct board_info __initdata boar 3 @@ -1619,6 +1619,59 @@ static struct board_info __initdata boar
4 .has_ehci0 = 1, 4 .has_ehci0 = 1,
5 }; 5 };
6 6
7 +static struct sprom_fixup __initdata vr3025u_fixups[] = { 7 +static struct sprom_fixup __initdata vr3025u_fixups[] = {
8 + { .offset = 97, .value = 0xfeb3 }, 8 + { .offset = 97, .value = 0xfeb3 },
9 + { .offset = 98, .value = 0x1618 }, 9 + { .offset = 98, .value = 0x1618 },
10 + { .offset = 99, .value = 0xfab0 }, 10 + { .offset = 99, .value = 0xfab0 },
11 + { .offset = 113, .value = 0xfed1 }, 11 + { .offset = 113, .value = 0xfed1 },
12 + { .offset = 114, .value = 0x1609 }, 12 + { .offset = 114, .value = 0x1609 },
13 + { .offset = 115, .value = 0xfad9 }, 13 + { .offset = 115, .value = 0xfad9 },
14 +}; 14 +};
15 + 15 +
16 +static struct board_info __initdata board_VR3025u = { 16 +static struct board_info __initdata board_VR3025u = {
17 + .name = "96368M-1541N", 17 + .name = "96368M-1541N",
18 + .expected_cpu_id = 0x6368, 18 + .expected_cpu_id = 0x6368,
19 + 19 +
20 + .has_pci = 1, 20 + .has_pci = 1,
21 + .use_fallback_sprom = 1, 21 + .use_fallback_sprom = 1,
22 + .has_ohci0 = 1, 22 + .has_ohci0 = 1,
23 + .has_ehci0 = 1, 23 + .has_ehci0 = 1,
24 + 24 +
25 + .has_enetsw = 1, 25 + .has_enetsw = 1,
26 + .enetsw = { 26 + .enetsw = {
27 + .used_ports = { 27 + .used_ports = {
28 + [0] = { 28 + [0] = {
29 + .used = 1, 29 + .used = 1,
30 + .phy_id = 1, 30 + .phy_id = 1,
31 + .name = "port1", 31 + .name = "port1",
32 + }, 32 + },
33 + [1] = { 33 + [1] = {
34 + .used = 1, 34 + .used = 1,
35 + .phy_id = 2, 35 + .phy_id = 2,
36 + .name = "port2", 36 + .name = "port2",
37 + }, 37 + },
38 + [2] = { 38 + [2] = {
39 + .used = 1, 39 + .used = 1,
40 + .phy_id = 3, 40 + .phy_id = 3,
41 + .name = "port3", 41 + .name = "port3",
42 + }, 42 + },
43 + [3] = { 43 + [3] = {
44 + .used = 1, 44 + .used = 1,
45 + .phy_id = 4, 45 + .phy_id = 4,
46 + .name = "port4", 46 + .name = "port4",
47 + }, 47 + },
48 + }, 48 + },
49 + }, 49 + },
50 + 50 +
51 + .fallback_sprom = { 51 + .fallback_sprom = {
52 + .type = SPROM_BCM43222, 52 + .type = SPROM_BCM43222,
53 + .pci_bus = 0, 53 + .pci_bus = 0,
54 + .pci_dev = 1, 54 + .pci_dev = 1,
55 + .board_fixups = vr3025u_fixups, 55 + .board_fixups = vr3025u_fixups,
56 + .num_board_fixups = ARRAY_SIZE(vr3025u_fixups), 56 + .num_board_fixups = ARRAY_SIZE(vr3025u_fixups),
57 + }, 57 + },
58 +}; 58 +};
59 + 59 +
60 static struct sprom_fixup __initdata wap5813n_fixups[] = { 60 static struct sprom_fixup __initdata wap5813n_fixups[] = {
61 { .offset = 97, .value = 0xfeed }, 61 { .offset = 97, .value = 0xfeed },
62 { .offset = 98, .value = 0x15d1 }, 62 { .offset = 98, .value = 0x15d1 },
63 @@ -1841,6 +1894,7 @@ static const struct board_info __initcon 63 @@ -1889,6 +1942,7 @@ static const struct board_info __initcon
64 #ifdef CONFIG_BCM63XX_CPU_6368 64 #ifdef CONFIG_BCM63XX_CPU_6368
65 &board_96368mvwg, 65 &board_96368mvwg,
66 &board_96368mvngr, 66 &board_96368mvngr,
67 + &board_VR3025u, 67 + &board_VR3025u,
68 &board_WAP5813n, 68 &board_WAP5813n,
69 #endif 69 #endif
70 #ifdef CONFIG_BCM63XX_CPU_63268 70 #ifdef CONFIG_BCM63XX_CPU_63268
71 @@ -1934,6 +1988,7 @@ static struct of_device_id const bcm963x 71 @@ -1982,6 +2036,7 @@ static struct of_device_id const bcm963x
72 #ifdef CONFIG_BCM63XX_CPU_6368 72 #ifdef CONFIG_BCM63XX_CPU_6368
73 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, 73 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
74 { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, 74 { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
75 + { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, 75 + { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
76 { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, 76 { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
77 #endif 77 #endif
78 #ifdef CONFIG_BCM63XX_CPU_63268 78 #ifdef CONFIG_BCM63XX_CPU_63268
79   79