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,78 @@ static struct board_info __initdata boar 3 @@ -93,6 +93,78 @@ static struct board_info __initdata boar
4 }, 4 },
5 }; 5 };
6 6
7 +static struct sprom_fixup __initdata ar5387un_fixups[] = { 7 +static struct sprom_fixup __initdata ar5387un_fixups[] = {
8 + { .offset = 2, .value = 0x05bb }, 8 + { .offset = 2, .value = 0x05bb },
9 + { .offset = 65, .value = 0x1204 }, 9 + { .offset = 65, .value = 0x1204 },
10 + { .offset = 78, .value = 0x0303 }, 10 + { .offset = 78, .value = 0x0303 },
11 + { .offset = 79, .value = 0x0202 }, 11 + { .offset = 79, .value = 0x0202 },
12 + { .offset = 80, .value = 0xff02 }, 12 + { .offset = 80, .value = 0xff02 },
13 + { .offset = 87, .value = 0x0315 }, 13 + { .offset = 87, .value = 0x0315 },
14 + { .offset = 88, .value = 0x0315 }, 14 + { .offset = 88, .value = 0x0315 },
15 + { .offset = 96, .value = 0x2048 }, 15 + { .offset = 96, .value = 0x2048 },
16 + { .offset = 97, .value = 0xff11 }, 16 + { .offset = 97, .value = 0xff11 },
17 + { .offset = 98, .value = 0x1567 }, 17 + { .offset = 98, .value = 0x1567 },
18 + { .offset = 99, .value = 0xfb24 }, 18 + { .offset = 99, .value = 0xfb24 },
19 + { .offset = 100, .value = 0x3e3c }, 19 + { .offset = 100, .value = 0x3e3c },
20 + { .offset = 101, .value = 0x4038 }, 20 + { .offset = 101, .value = 0x4038 },
21 + { .offset = 102, .value = 0xfe7f }, 21 + { .offset = 102, .value = 0xfe7f },
22 + { .offset = 103, .value = 0x1279 }, 22 + { .offset = 103, .value = 0x1279 },
23 + { .offset = 112, .value = 0x2048 }, 23 + { .offset = 112, .value = 0x2048 },
24 + { .offset = 113, .value = 0xff03 }, 24 + { .offset = 113, .value = 0xff03 },
25 + { .offset = 114, .value = 0x154c }, 25 + { .offset = 114, .value = 0x154c },
26 + { .offset = 115, .value = 0xfb27 }, 26 + { .offset = 115, .value = 0xfb27 },
27 + { .offset = 116, .value = 0x3e3c }, 27 + { .offset = 116, .value = 0x3e3c },
28 + { .offset = 117, .value = 0x4038 }, 28 + { .offset = 117, .value = 0x4038 },
29 + { .offset = 118, .value = 0xfe87 }, 29 + { .offset = 118, .value = 0xfe87 },
30 + { .offset = 119, .value = 0x1233 }, 30 + { .offset = 119, .value = 0x1233 },
31 + { .offset = 203, .value = 0x2226 }, 31 + { .offset = 203, .value = 0x2226 },
32 +}; 32 +};
33 + 33 +
34 +static struct board_info __initdata board_AR5387un = { 34 +static struct board_info __initdata board_AR5387un = {
35 + .name = "96328A-1441N1", 35 + .name = "96328A-1441N1",
36 + .expected_cpu_id = 0x6328, 36 + .expected_cpu_id = 0x6328,
37 + 37 +
38 + .has_pci = 1, 38 + .has_pci = 1,
39 + .use_fallback_sprom = 1, 39 + .use_fallback_sprom = 1,
40 + .has_ohci0 = 1, 40 + .has_ohci0 = 1,
41 + .has_ehci0 = 1, 41 + .has_ehci0 = 1,
42 + .num_usbh_ports = 1, 42 + .num_usbh_ports = 1,
43 + .has_enetsw = 1, 43 + .has_enetsw = 1,
44 + 44 +
45 + .enetsw = { 45 + .enetsw = {
46 + .used_ports = { 46 + .used_ports = {
47 + [0] = { 47 + [0] = {
48 + .used = 1, 48 + .used = 1,
49 + .phy_id = 1, 49 + .phy_id = 1,
50 + .name = "Port 1", 50 + .name = "Port 1",
51 + }, 51 + },
52 + [1] = { 52 + [1] = {
53 + .used = 1, 53 + .used = 1,
54 + .phy_id = 2, 54 + .phy_id = 2,
55 + .name = "Port 2", 55 + .name = "Port 2",
56 + }, 56 + },
57 + [2] = { 57 + [2] = {
58 + .used = 1, 58 + .used = 1,
59 + .phy_id = 3, 59 + .phy_id = 3,
60 + .name = "Port 3", 60 + .name = "Port 3",
61 + }, 61 + },
62 + [3] = { 62 + [3] = {
63 + .used = 1, 63 + .used = 1,
64 + .phy_id = 4, 64 + .phy_id = 4,
65 + .name = "Port 4", 65 + .name = "Port 4",
66 + }, 66 + },
67 + }, 67 + },
68 + }, 68 + },
69 + 69 +
70 + .fallback_sprom = { 70 + .fallback_sprom = {
71 + .type = SPROM_BCM43225, 71 + .type = SPROM_BCM43225,
72 + .pci_bus = 1, 72 + .pci_bus = 1,
73 + .pci_dev = 0, 73 + .pci_dev = 0,
74 + .board_fixups = ar5387un_fixups, 74 + .board_fixups = ar5387un_fixups,
75 + .num_board_fixups = ARRAY_SIZE(ar5387un_fixups), 75 + .num_board_fixups = ARRAY_SIZE(ar5387un_fixups),
76 + }, 76 + },
77 +}; 77 +};
78 + 78 +
79 static struct board_info __initdata board_963281TAN = { 79 static struct board_info __initdata board_963281TAN = {
80 .name = "963281TAN", 80 .name = "963281TAN",
81 .expected_cpu_id = 0x6328, 81 .expected_cpu_id = 0x6328,
82 @@ -1153,6 +1225,7 @@ static const struct board_info __initcon 82 @@ -1201,6 +1273,7 @@ static const struct board_info __initcon
83 #endif 83 #endif
84 #ifdef CONFIG_BCM63XX_CPU_6328 84 #ifdef CONFIG_BCM63XX_CPU_6328
85 &board_96328avng, 85 &board_96328avng,
86 + &board_AR5387un, 86 + &board_AR5387un,
87 &board_963281TAN, 87 &board_963281TAN,
88 &board_A4001N1, 88 &board_A4001N1,
89 &board_dsl_274xb_f1, 89 &board_dsl_274xb_f1,
90 @@ -1223,6 +1296,7 @@ static struct of_device_id const bcm963x 90 @@ -1271,6 +1344,7 @@ static struct of_device_id const bcm963x
91 { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, 91 { .compatible = "adb,a4001n1", .data = &board_A4001N1, },
92 { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, }, 92 { .compatible = "brcm,bcm963281TAN", .data = &board_963281TAN, },
93 { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, 93 { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
94 + { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, 94 + { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
95 { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, }, 95 { .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },
96 #endif 96 #endif
97 #ifdef CONFIG_BCM63XX_CPU_6338 97 #ifdef CONFIG_BCM63XX_CPU_6338
98   98