OpenWrt – Blame information for rev 3
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 1 | --- a/arch/mips/bcm63xx/Makefile |
2 | +++ b/arch/mips/bcm63xx/Makefile |
||
3 | @@ -1,7 +1,7 @@ |
||
4 | # SPDX-License-Identifier: GPL-2.0 |
||
5 | obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \ |
||
3 | office | 6 | setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \ |
7 | - dev-pcmcia.o dev-rng.o dev-uart.o \ |
||
8 | + dev-pcmcia.o dev-rng.o \ |
||
9 | dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \ |
||
10 | usb-common.o sprom.o |
||
1 | office | 11 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
12 | --- a/arch/mips/bcm63xx/dev-uart.c |
||
13 | +++ /dev/null |
||
14 | @@ -1,76 +0,0 @@ |
||
15 | -/* |
||
16 | - * This file is subject to the terms and conditions of the GNU General Public |
||
17 | - * License. See the file "COPYING" in the main directory of this archive |
||
18 | - * for more details. |
||
19 | - * |
||
20 | - * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr> |
||
21 | - */ |
||
22 | - |
||
23 | -#include <linux/init.h> |
||
24 | -#include <linux/kernel.h> |
||
25 | -#include <linux/platform_device.h> |
||
26 | -#include <bcm63xx_cpu.h> |
||
27 | - |
||
28 | -static struct resource uart0_resources[] = { |
||
29 | - { |
||
30 | - /* start & end filled at runtime */ |
||
31 | - .flags = IORESOURCE_MEM, |
||
32 | - }, |
||
33 | - { |
||
34 | - /* start filled at runtime */ |
||
35 | - .flags = IORESOURCE_IRQ, |
||
36 | - }, |
||
37 | -}; |
||
38 | - |
||
39 | -static struct resource uart1_resources[] = { |
||
40 | - { |
||
41 | - /* start & end filled at runtime */ |
||
42 | - .flags = IORESOURCE_MEM, |
||
43 | - }, |
||
44 | - { |
||
45 | - /* start filled at runtime */ |
||
46 | - .flags = IORESOURCE_IRQ, |
||
47 | - }, |
||
48 | -}; |
||
49 | - |
||
50 | -static struct platform_device bcm63xx_uart_devices[] = { |
||
51 | - { |
||
52 | - .name = "bcm63xx_uart", |
||
53 | - .id = 0, |
||
54 | - .num_resources = ARRAY_SIZE(uart0_resources), |
||
55 | - .resource = uart0_resources, |
||
56 | - }, |
||
57 | - |
||
58 | - { |
||
59 | - .name = "bcm63xx_uart", |
||
60 | - .id = 1, |
||
61 | - .num_resources = ARRAY_SIZE(uart1_resources), |
||
62 | - .resource = uart1_resources, |
||
63 | - } |
||
64 | -}; |
||
65 | - |
||
66 | -int __init bcm63xx_uart_register(unsigned int id) |
||
67 | -{ |
||
68 | - if (id >= ARRAY_SIZE(bcm63xx_uart_devices)) |
||
69 | - return -ENODEV; |
||
70 | - |
||
71 | - if (id == 1 && (!BCMCPU_IS_3368() && !BCMCPU_IS_6358() && |
||
72 | - !BCMCPU_IS_6368())) |
||
73 | - return -ENODEV; |
||
74 | - |
||
75 | - if (id == 0) { |
||
76 | - uart0_resources[0].start = bcm63xx_regset_address(RSET_UART0); |
||
77 | - uart0_resources[0].end = uart0_resources[0].start + |
||
78 | - RSET_UART_SIZE - 1; |
||
79 | - uart0_resources[1].start = bcm63xx_get_irq_number(IRQ_UART0); |
||
80 | - } |
||
81 | - |
||
82 | - if (id == 1) { |
||
83 | - uart1_resources[0].start = bcm63xx_regset_address(RSET_UART1); |
||
84 | - uart1_resources[0].end = uart1_resources[0].start + |
||
85 | - RSET_UART_SIZE - 1; |
||
86 | - uart1_resources[1].start = bcm63xx_get_irq_number(IRQ_UART1); |
||
87 | - } |
||
88 | - |
||
89 | - return platform_device_register(&bcm63xx_uart_devices[id]); |
||
90 | -} |
||
91 | --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h |
||
92 | +++ /dev/null |
||
93 | @@ -1,7 +0,0 @@ |
||
94 | -/* SPDX-License-Identifier: GPL-2.0 */ |
||
95 | -#ifndef BCM63XX_DEV_UART_H_ |
||
96 | -#define BCM63XX_DEV_UART_H_ |
||
97 | - |
||
98 | -int bcm63xx_uart_register(unsigned int id); |
||
99 | - |
||
100 | -#endif /* BCM63XX_DEV_UART_H_ */ |
||
101 | --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
||
102 | +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
||
3 | office | 103 | @@ -34,8 +34,6 @@ struct board_info { |
1 | office | 104 | unsigned int has_ehci0:1; |
105 | unsigned int has_usbd:1; |
||
3 | office | 106 | unsigned int has_dsp:1; |
1 | office | 107 | - unsigned int has_uart0:1; |
108 | - unsigned int has_uart1:1; |
||
109 | unsigned int use_fallback_sprom:1; |
||
110 | |||
111 | /* ethernet config */ |
||
112 | --- a/arch/mips/bcm63xx/boards/board_common.c |
||
113 | +++ b/arch/mips/bcm63xx/boards/board_common.c |
||
114 | @@ -20,7 +20,6 @@ |
||
115 | #include <asm/prom.h> |
||
116 | #include <bcm63xx_board.h> |
||
117 | #include <bcm63xx_cpu.h> |
||
118 | -#include <bcm63xx_dev_uart.h> |
||
119 | #include <bcm63xx_regs.h> |
||
120 | #include <bcm63xx_io.h> |
||
121 | #include <bcm63xx_gpio.h> |
||
3 | office | 122 | @@ -189,12 +188,6 @@ int __init board_register_devices(void) |
1 | office | 123 | |
124 | bcm63xx_gpio_init(); |
||
125 | |||
126 | - if (board.has_uart0) |
||
127 | - bcm63xx_uart_register(0); |
||
128 | - |
||
129 | - if (board.has_uart1) |
||
130 | - bcm63xx_uart_register(1); |
||
131 | - |
||
132 | if (board.has_pccard) |
||
133 | bcm63xx_pcmcia_register(); |
||
134 | |||
135 | --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c |
||
136 | +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c |
||
137 | @@ -35,9 +35,6 @@ static struct board_info __initdata boar |
||
138 | .name = "CVG834G_E15R3921", |
||
139 | .expected_cpu_id = 0x3368, |
||
140 | |||
141 | - .has_uart0 = 1, |
||
142 | - .has_uart1 = 1, |
||
143 | - |
||
144 | .has_enet0 = 1, |
||
145 | .has_pci = 1, |
||
146 | |||
147 | @@ -67,7 +64,6 @@ static struct board_info __initdata boar |
||
148 | .name = "96328avng", |
||
149 | .expected_cpu_id = 0x6328, |
||
150 | |||
151 | - .has_uart0 = 1, |
||
152 | .has_pci = 1, |
||
153 | .has_usbd = 0, |
||
154 | .use_fallback_sprom = 1, |
||
155 | @@ -116,7 +112,6 @@ static struct board_info __initdata boar |
||
156 | .name = "96338GW", |
||
157 | .expected_cpu_id = 0x6338, |
||
158 | |||
159 | - .has_uart0 = 1, |
||
160 | .has_enet0 = 1, |
||
161 | .enet0 = { |
||
162 | .force_speed_100 = 1, |
||
163 | @@ -159,7 +154,6 @@ static struct board_info __initdata boar |
||
164 | .name = "96338W", |
||
165 | .expected_cpu_id = 0x6338, |
||
166 | |||
167 | - .has_uart0 = 1, |
||
168 | .has_enet0 = 1, |
||
169 | .enet0 = { |
||
170 | .force_speed_100 = 1, |
||
171 | @@ -204,8 +198,6 @@ static struct board_info __initdata boar |
||
172 | static struct board_info __initdata board_96345gw2 = { |
||
173 | .name = "96345GW2", |
||
174 | .expected_cpu_id = 0x6345, |
||
175 | - |
||
176 | - .has_uart0 = 1, |
||
177 | }; |
||
178 | #endif |
||
179 | |||
180 | @@ -217,7 +209,6 @@ static struct board_info __initdata boar |
||
181 | .name = "96348R", |
||
182 | .expected_cpu_id = 0x6348, |
||
183 | |||
184 | - .has_uart0 = 1, |
||
185 | .has_enet0 = 1, |
||
186 | .has_pci = 1, |
||
187 | .use_fallback_sprom = 1, |
||
188 | @@ -262,7 +253,6 @@ static struct board_info __initdata boar |
||
189 | .name = "96348GW-10", |
||
190 | .expected_cpu_id = 0x6348, |
||
191 | |||
192 | - .has_uart0 = 1, |
||
193 | .has_enet0 = 1, |
||
194 | .has_enet1 = 1, |
||
195 | .has_pci = 1, |
||
3 | office | 196 | @@ -323,7 +313,6 @@ static struct board_info __initdata boar |
1 | office | 197 | .name = "96348GW-11", |
198 | .expected_cpu_id = 0x6348, |
||
199 | |||
200 | - .has_uart0 = 1, |
||
201 | .has_enet0 = 1, |
||
202 | .has_enet1 = 1, |
||
203 | .has_pci = 1, |
||
3 | office | 204 | @@ -378,7 +367,6 @@ static struct board_info __initdata boar |
1 | office | 205 | .name = "96348GW", |
206 | .expected_cpu_id = 0x6348, |
||
207 | |||
208 | - .has_uart0 = 1, |
||
209 | .has_enet0 = 1, |
||
210 | .has_enet1 = 1, |
||
211 | .has_pci = 1, |
||
3 | office | 212 | @@ -437,7 +425,6 @@ static struct board_info __initdata boar |
1 | office | 213 | .name = "F@ST2404", |
214 | .expected_cpu_id = 0x6348, |
||
215 | |||
216 | - .has_uart0 = 1, |
||
217 | .has_enet0 = 1, |
||
218 | .has_enet1 = 1, |
||
219 | .has_pci = 1, |
||
3 | office | 220 | @@ -482,7 +469,6 @@ static struct board_info __initdata boar |
1 | office | 221 | .name = "DV201AMR", |
222 | .expected_cpu_id = 0x6348, |
||
223 | |||
224 | - .has_uart0 = 1, |
||
225 | .has_pci = 1, |
||
226 | .use_fallback_sprom = 1, |
||
227 | .has_ohci0 = 1, |
||
3 | office | 228 | @@ -503,7 +489,6 @@ static struct board_info __initdata boar |
1 | office | 229 | .name = "96348GW-A", |
230 | .expected_cpu_id = 0x6348, |
||
231 | |||
232 | - .has_uart0 = 1, |
||
233 | .has_enet0 = 1, |
||
234 | .has_enet1 = 1, |
||
235 | .has_pci = 1, |
||
3 | office | 236 | @@ -530,7 +515,6 @@ static struct board_info __initdata boar |
1 | office | 237 | .name = "96358VW", |
238 | .expected_cpu_id = 0x6358, |
||
239 | |||
240 | - .has_uart0 = 1, |
||
241 | .has_enet0 = 1, |
||
242 | .has_enet1 = 1, |
||
243 | .has_pci = 1, |
||
3 | office | 244 | @@ -583,7 +567,6 @@ static struct board_info __initdata boar |
1 | office | 245 | .name = "96358VW2", |
246 | .expected_cpu_id = 0x6358, |
||
247 | |||
248 | - .has_uart0 = 1, |
||
249 | .has_enet0 = 1, |
||
250 | .has_enet1 = 1, |
||
251 | .has_pci = 1, |
||
3 | office | 252 | @@ -633,7 +616,6 @@ static struct board_info __initdata boar |
1 | office | 253 | .name = "AGPF-S0", |
254 | .expected_cpu_id = 0x6358, |
||
255 | |||
256 | - .has_uart0 = 1, |
||
257 | .has_enet0 = 1, |
||
258 | .has_enet1 = 1, |
||
259 | .has_pci = 1, |