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 @@ -93,6 +93,60 @@ static struct board_info __initdata boar 3 @@ -93,6 +93,60 @@ static struct board_info __initdata boar
4 }, 4 },
5 }; 5 };
6 6
7 +static struct sprom_fixup __initdata ar5381u_fixups[] = { 7 +static struct sprom_fixup __initdata ar5381u_fixups[] = {
8 + { .offset = 97, .value = 0xfee5 }, 8 + { .offset = 97, .value = 0xfee5 },
9 + { .offset = 98, .value = 0x157c }, 9 + { .offset = 98, .value = 0x157c },
10 + { .offset = 99, .value = 0xfae7 }, 10 + { .offset = 99, .value = 0xfae7 },
11 + { .offset = 113, .value = 0xfefa }, 11 + { .offset = 113, .value = 0xfefa },
12 + { .offset = 114, .value = 0x15d6 }, 12 + { .offset = 114, .value = 0x15d6 },
13 + { .offset = 115, .value = 0xfaf8 }, 13 + { .offset = 115, .value = 0xfaf8 },
14 +}; 14 +};
15 + 15 +
16 +static struct board_info __initdata board_AR5381u = { 16 +static struct board_info __initdata board_AR5381u = {
17 + .name = "96328A-1241N", 17 + .name = "96328A-1241N",
18 + .expected_cpu_id = 0x6328, 18 + .expected_cpu_id = 0x6328,
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 + .num_usbh_ports = 1, 24 + .num_usbh_ports = 1,
25 + .has_enetsw = 1, 25 + .has_enetsw = 1,
26 + 26 +
27 + .enetsw = { 27 + .enetsw = {
28 + .used_ports = { 28 + .used_ports = {
29 + [0] = { 29 + [0] = {
30 + .used = 1, 30 + .used = 1,
31 + .phy_id = 1, 31 + .phy_id = 1,
32 + .name = "Port 1", 32 + .name = "Port 1",
33 + }, 33 + },
34 + [1] = { 34 + [1] = {
35 + .used = 1, 35 + .used = 1,
36 + .phy_id = 2, 36 + .phy_id = 2,
37 + .name = "Port 2", 37 + .name = "Port 2",
38 + }, 38 + },
39 + [2] = { 39 + [2] = {
40 + .used = 1, 40 + .used = 1,
41 + .phy_id = 3, 41 + .phy_id = 3,
42 + .name = "Port 3", 42 + .name = "Port 3",
43 + }, 43 + },
44 + [3] = { 44 + [3] = {
45 + .used = 1, 45 + .used = 1,
46 + .phy_id = 4, 46 + .phy_id = 4,
47 + .name = "Port 4", 47 + .name = "Port 4",
48 + }, 48 + },
49 + }, 49 + },
50 + }, 50 + },
51 + 51 +
52 + .fallback_sprom = { 52 + .fallback_sprom = {
53 + .type = SPROM_BCM43225, 53 + .type = SPROM_BCM43225,
54 + .pci_bus = 1, 54 + .pci_bus = 1,
55 + .pci_dev = 0, 55 + .pci_dev = 0,
56 + .board_fixups = ar5381u_fixups, 56 + .board_fixups = ar5381u_fixups,
57 + .num_board_fixups = ARRAY_SIZE(ar5381u_fixups), 57 + .num_board_fixups = ARRAY_SIZE(ar5381u_fixups),
58 + }, 58 + },
59 +}; 59 +};
60 + 60 +
61 static struct sprom_fixup __initdata ar5387un_fixups[] = { 61 static struct sprom_fixup __initdata ar5387un_fixups[] = {
62 { .offset = 2, .value = 0x05bb }, 62 { .offset = 2, .value = 0x05bb },
63 { .offset = 65, .value = 0x1204 }, 63 { .offset = 65, .value = 0x1204 },
64 @@ -1225,6 +1279,7 @@ static const struct board_info __initcon 64 @@ -1273,6 +1327,7 @@ static const struct board_info __initcon
65 #endif 65 #endif
66 #ifdef CONFIG_BCM63XX_CPU_6328 66 #ifdef CONFIG_BCM63XX_CPU_6328
67 &board_96328avng, 67 &board_96328avng,
68 + &board_AR5381u, 68 + &board_AR5381u,
69 &board_AR5387un, 69 &board_AR5387un,
70 &board_963281TAN, 70 &board_963281TAN,
71 &board_A4001N1, 71 &board_A4001N1,
72 @@ -1296,6 +1351,7 @@ static struct of_device_id const bcm963x 72 @@ -1344,6 +1399,7 @@ static struct of_device_id const bcm963x
73 { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, 73 { .compatible = "adb,a4001n1", .data = &board_A4001N1, },
74 { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, 74 { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
75 { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, 75 { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
76 + { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, 76 + { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
77 { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, 77 { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
78 { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, 78 { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },
79 #endif 79 #endif
80   80