1 --- a/arch/mips/bcm63xx/Makefile
2 +++ b/arch/mips/bcm63xx/Makefile
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 \
6 setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \
7 - dev-rng.o dev-uart.o dev-wdt.o \
8 + dev-rng.o dev-wdt.o \
9 dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o \
11 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
12 --- a/arch/mips/bcm63xx/dev-uart.c
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
20 - * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
23 -#include <linux/init.h>
24 -#include <linux/kernel.h>
25 -#include <linux/platform_device.h>
26 -#include <bcm63xx_cpu.h>
28 -static struct resource uart0_resources[] = {
30 - /* start & end filled at runtime */
31 - .flags = IORESOURCE_MEM,
34 - /* start filled at runtime */
35 - .flags = IORESOURCE_IRQ,
39 -static struct resource uart1_resources[] = {
41 - /* start & end filled at runtime */
42 - .flags = IORESOURCE_MEM,
45 - /* start filled at runtime */
46 - .flags = IORESOURCE_IRQ,
50 -static struct platform_device bcm63xx_uart_devices[] = {
52 - .name = "bcm63xx_uart",
54 - .num_resources = ARRAY_SIZE(uart0_resources),
55 - .resource = uart0_resources,
59 - .name = "bcm63xx_uart",
61 - .num_resources = ARRAY_SIZE(uart1_resources),
62 - .resource = uart1_resources,
66 -int __init bcm63xx_uart_register(unsigned int id)
68 - if (id >= ARRAY_SIZE(bcm63xx_uart_devices))
71 - if (id == 1 && (!BCMCPU_IS_3368() && !BCMCPU_IS_6358() &&
76 - uart0_resources[0].start = bcm63xx_regset_address(RSET_UART0);
77 - uart0_resources[0].end = uart0_resources[0].start +
79 - uart0_resources[1].start = bcm63xx_get_irq_number(IRQ_UART0);
83 - uart1_resources[0].start = bcm63xx_regset_address(RSET_UART1);
84 - uart1_resources[0].end = uart1_resources[0].start +
86 - uart1_resources[1].start = bcm63xx_get_irq_number(IRQ_UART1);
89 - return platform_device_register(&bcm63xx_uart_devices[id]);
91 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h
94 -/* SPDX-License-Identifier: GPL-2.0 */
95 -#ifndef BCM63XX_DEV_UART_H_
96 -#define BCM63XX_DEV_UART_H_
98 -int bcm63xx_uart_register(unsigned int id);
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
103 @@ -32,8 +32,6 @@ struct board_info {
104 unsigned int has_ohci0:1;
105 unsigned int has_ehci0:1;
106 unsigned int has_usbd:1;
107 - unsigned int has_uart0:1;
108 - unsigned int has_uart1:1;
109 unsigned int use_fallback_sprom:1;
111 /* ethernet config */
112 --- a/arch/mips/bcm63xx/boards/board_common.c
113 +++ b/arch/mips/bcm63xx/boards/board_common.c
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>
122 @@ -188,12 +187,6 @@ int __init board_register_devices(void)
126 - if (board.has_uart0)
127 - bcm63xx_uart_register(0);
129 - if (board.has_uart1)
130 - bcm63xx_uart_register(1);
132 if (board.has_pccard)
133 bcm63xx_pcmcia_register();
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,
147 @@ -67,7 +64,6 @@ static struct board_info __initdata boar
149 .expected_cpu_id = 0x6328,
154 .use_fallback_sprom = 1,
155 @@ -116,7 +112,6 @@ static struct board_info __initdata boar
157 .expected_cpu_id = 0x6338,
162 .force_speed_100 = 1,
163 @@ -159,7 +154,6 @@ static struct board_info __initdata boar
165 .expected_cpu_id = 0x6338,
170 .force_speed_100 = 1,
171 @@ -204,8 +198,6 @@ static struct board_info __initdata boar
172 static struct board_info __initdata board_96345gw2 = {
174 .expected_cpu_id = 0x6345,
180 @@ -217,7 +209,6 @@ static struct board_info __initdata boar
182 .expected_cpu_id = 0x6348,
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,
196 @@ -315,7 +305,6 @@ static struct board_info __initdata boar
197 .name = "96348GW-11",
198 .expected_cpu_id = 0x6348,
204 @@ -370,7 +359,6 @@ static struct board_info __initdata boar
206 .expected_cpu_id = 0x6348,
212 @@ -421,7 +409,6 @@ static struct board_info __initdata boar
214 .expected_cpu_id = 0x6348,
220 @@ -466,7 +453,6 @@ static struct board_info __initdata boar
222 .expected_cpu_id = 0x6348,
226 .use_fallback_sprom = 1,
228 @@ -487,7 +473,6 @@ static struct board_info __initdata boar
230 .expected_cpu_id = 0x6348,
236 @@ -514,7 +499,6 @@ static struct board_info __initdata boar
238 .expected_cpu_id = 0x6358,
244 @@ -567,7 +551,6 @@ static struct board_info __initdata boar
246 .expected_cpu_id = 0x6358,
252 @@ -617,7 +600,6 @@ static struct board_info __initdata boar
254 .expected_cpu_id = 0x6358,