OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 --- a/arch/mips/bcm63xx/Makefile 1 --- a/arch/mips/bcm63xx/Makefile
2 +++ b/arch/mips/bcm63xx/Makefile 2 +++ b/arch/mips/bcm63xx/Makefile
3 @@ -1,7 +1,7 @@ 3 @@ -1,7 +1,7 @@
4 # SPDX-License-Identifier: GPL-2.0 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 \ 5 obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
6 setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \ 6 setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
7 - dev-rng.o dev-uart.o dev-wdt.o \ 7 - dev-pcmcia.o dev-rng.o dev-uart.o \
8 + dev-rng.o dev-wdt.o \ 8 + dev-pcmcia.o dev-rng.o \
9 dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o \ 9 dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
10 sprom.o 10 usb-common.o sprom.o
11 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 11 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
12 --- a/arch/mips/bcm63xx/dev-uart.c 12 --- a/arch/mips/bcm63xx/dev-uart.c
13 +++ /dev/null 13 +++ /dev/null
14 @@ -1,76 +0,0 @@ 14 @@ -1,76 +0,0 @@
15 -/* 15 -/*
Line 98... Line 98...
98 -int bcm63xx_uart_register(unsigned int id); 98 -int bcm63xx_uart_register(unsigned int id);
99 - 99 -
100 -#endif /* BCM63XX_DEV_UART_H_ */ 100 -#endif /* BCM63XX_DEV_UART_H_ */
101 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 101 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
102 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 102 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
103 @@ -32,8 +32,6 @@ struct board_info { 103 @@ -34,8 +34,6 @@ struct board_info {
104 unsigned int has_ohci0:1; -  
105 unsigned int has_ehci0:1; 104 unsigned int has_ehci0:1;
106 unsigned int has_usbd:1; 105 unsigned int has_usbd:1;
-   106 unsigned int has_dsp:1;
107 - unsigned int has_uart0:1; 107 - unsigned int has_uart0:1;
108 - unsigned int has_uart1:1; 108 - unsigned int has_uart1:1;
109 unsigned int use_fallback_sprom:1; 109 unsigned int use_fallback_sprom:1;
Line 110... Line 110...
110 110
Line 117... Line 117...
117 #include <bcm63xx_cpu.h> 117 #include <bcm63xx_cpu.h>
118 -#include <bcm63xx_dev_uart.h> 118 -#include <bcm63xx_dev_uart.h>
119 #include <bcm63xx_regs.h> 119 #include <bcm63xx_regs.h>
120 #include <bcm63xx_io.h> 120 #include <bcm63xx_io.h>
121 #include <bcm63xx_gpio.h> 121 #include <bcm63xx_gpio.h>
122 @@ -188,12 +187,6 @@ int __init board_register_devices(void) 122 @@ -189,12 +188,6 @@ int __init board_register_devices(void)
Line 123... Line 123...
123 123
Line 124... Line 124...
124 bcm63xx_gpio_init(); 124 bcm63xx_gpio_init();
125 125
Line 191... Line 191...
191 191
192 - .has_uart0 = 1, 192 - .has_uart0 = 1,
193 .has_enet0 = 1, 193 .has_enet0 = 1,
194 .has_enet1 = 1, 194 .has_enet1 = 1,
195 .has_pci = 1, 195 .has_pci = 1,
196 @@ -315,7 +305,6 @@ static struct board_info __initdata boar 196 @@ -323,7 +313,6 @@ static struct board_info __initdata boar
197 .name = "96348GW-11", 197 .name = "96348GW-11",
Line 198... Line 198...
198 .expected_cpu_id = 0x6348, 198 .expected_cpu_id = 0x6348,
199 199
200 - .has_uart0 = 1, 200 - .has_uart0 = 1,
201 .has_enet0 = 1, 201 .has_enet0 = 1,
202 .has_enet1 = 1, 202 .has_enet1 = 1,
203 .has_pci = 1, 203 .has_pci = 1,
204 @@ -370,7 +359,6 @@ static struct board_info __initdata boar 204 @@ -378,7 +367,6 @@ static struct board_info __initdata boar
Line 205... Line 205...
205 .name = "96348GW", 205 .name = "96348GW",
206 .expected_cpu_id = 0x6348, 206 .expected_cpu_id = 0x6348,
207 207
208 - .has_uart0 = 1, 208 - .has_uart0 = 1,
209 .has_enet0 = 1, 209 .has_enet0 = 1,
210 .has_enet1 = 1, 210 .has_enet1 = 1,
211 .has_pci = 1, 211 .has_pci = 1,
Line 212... Line 212...
212 @@ -421,7 +409,6 @@ static struct board_info __initdata boar 212 @@ -437,7 +425,6 @@ static struct board_info __initdata boar
213 .name = "F@ST2404", 213 .name = "F@ST2404",
214 .expected_cpu_id = 0x6348, 214 .expected_cpu_id = 0x6348,
215 215
216 - .has_uart0 = 1, 216 - .has_uart0 = 1,
217 .has_enet0 = 1, 217 .has_enet0 = 1,
218 .has_enet1 = 1, 218 .has_enet1 = 1,
Line 219... Line 219...
219 .has_pci = 1, 219 .has_pci = 1,
220 @@ -466,7 +453,6 @@ static struct board_info __initdata boar 220 @@ -482,7 +469,6 @@ static struct board_info __initdata boar
221 .name = "DV201AMR", 221 .name = "DV201AMR",
222 .expected_cpu_id = 0x6348, 222 .expected_cpu_id = 0x6348,
223 223
224 - .has_uart0 = 1, 224 - .has_uart0 = 1,
225 .has_pci = 1, 225 .has_pci = 1,
Line 226... Line 226...
226 .use_fallback_sprom = 1, 226 .use_fallback_sprom = 1,
227 .has_ohci0 = 1, 227 .has_ohci0 = 1,
228 @@ -487,7 +473,6 @@ static struct board_info __initdata boar 228 @@ -503,7 +489,6 @@ static struct board_info __initdata boar
229 .name = "96348GW-A", 229 .name = "96348GW-A",
230 .expected_cpu_id = 0x6348, 230 .expected_cpu_id = 0x6348,
231 231
232 - .has_uart0 = 1, 232 - .has_uart0 = 1,
Line 233... Line 233...
233 .has_enet0 = 1, 233 .has_enet0 = 1,
234 .has_enet1 = 1, 234 .has_enet1 = 1,
235 .has_pci = 1, 235 .has_pci = 1,
236 @@ -514,7 +499,6 @@ static struct board_info __initdata boar 236 @@ -530,7 +515,6 @@ static struct board_info __initdata boar
237 .name = "96358VW", 237 .name = "96358VW",
238 .expected_cpu_id = 0x6358, 238 .expected_cpu_id = 0x6358,
239 239
Line 240... Line 240...
240 - .has_uart0 = 1, 240 - .has_uart0 = 1,
241 .has_enet0 = 1, 241 .has_enet0 = 1,
242 .has_enet1 = 1, 242 .has_enet1 = 1,
243 .has_pci = 1, 243 .has_pci = 1,
244 @@ -567,7 +551,6 @@ static struct board_info __initdata boar 244 @@ -583,7 +567,6 @@ static struct board_info __initdata boar
245 .name = "96358VW2", 245 .name = "96358VW2",
246 .expected_cpu_id = 0x6358, 246 .expected_cpu_id = 0x6358,
Line 247... Line 247...
247 247
248 - .has_uart0 = 1, 248 - .has_uart0 = 1,