1 --- a/arch/mips/bcm63xx/Makefile
2 +++ b/arch/mips/bcm63xx/Makefile
4 obj-y += clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
5 setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
6 - dev-pcmcia.o dev-rng.o dev-uart.o \
7 + dev-pcmcia.o dev-rng.o \
8 dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
10 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
11 --- a/arch/mips/bcm63xx/dev-uart.c
15 - * This file is subject to the terms and conditions of the GNU General Public
16 - * License. See the file "COPYING" in the main directory of this archive
19 - * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
22 -#include <linux/init.h>
23 -#include <linux/kernel.h>
24 -#include <linux/platform_device.h>
25 -#include <bcm63xx_cpu.h>
27 -static struct resource uart0_resources[] = {
29 - /* start & end filled at runtime */
30 - .flags = IORESOURCE_MEM,
33 - /* start filled at runtime */
34 - .flags = IORESOURCE_IRQ,
38 -static struct resource uart1_resources[] = {
40 - /* start & end filled at runtime */
41 - .flags = IORESOURCE_MEM,
44 - /* start filled at runtime */
45 - .flags = IORESOURCE_IRQ,
49 -static struct platform_device bcm63xx_uart_devices[] = {
51 - .name = "bcm63xx_uart",
53 - .num_resources = ARRAY_SIZE(uart0_resources),
54 - .resource = uart0_resources,
58 - .name = "bcm63xx_uart",
60 - .num_resources = ARRAY_SIZE(uart1_resources),
61 - .resource = uart1_resources,
65 -int __init bcm63xx_uart_register(unsigned int id)
67 - if (id >= ARRAY_SIZE(bcm63xx_uart_devices))
70 - if (id == 1 && (!BCMCPU_IS_3368() && !BCMCPU_IS_6358() &&
75 - uart0_resources[0].start = bcm63xx_regset_address(RSET_UART0);
76 - uart0_resources[0].end = uart0_resources[0].start +
78 - uart0_resources[1].start = bcm63xx_get_irq_number(IRQ_UART0);
82 - uart1_resources[0].start = bcm63xx_regset_address(RSET_UART1);
83 - uart1_resources[0].end = uart1_resources[0].start +
85 - uart1_resources[1].start = bcm63xx_get_irq_number(IRQ_UART1);
88 - return platform_device_register(&bcm63xx_uart_devices[id]);
90 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h
93 -#ifndef BCM63XX_DEV_UART_H_
94 -#define BCM63XX_DEV_UART_H_
96 -int bcm63xx_uart_register(unsigned int id);
98 -#endif /* BCM63XX_DEV_UART_H_ */
99 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
100 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
101 @@ -33,8 +33,6 @@ struct board_info {
102 unsigned int has_ehci0:1;
103 unsigned int has_usbd:1;
104 unsigned int has_dsp:1;
105 - unsigned int has_uart0:1;
106 - unsigned int has_uart1:1;
107 unsigned int use_fallback_sprom:1;
109 /* ethernet config */
110 --- a/arch/mips/bcm63xx/boards/board_common.c
111 +++ b/arch/mips/bcm63xx/boards/board_common.c
113 #include <asm/prom.h>
114 #include <bcm63xx_board.h>
115 #include <bcm63xx_cpu.h>
116 -#include <bcm63xx_dev_uart.h>
117 #include <bcm63xx_regs.h>
118 #include <bcm63xx_io.h>
119 #include <bcm63xx_gpio.h>
120 @@ -189,12 +188,6 @@ int __init board_register_devices(void)
124 - if (board.has_uart0)
125 - bcm63xx_uart_register(0);
127 - if (board.has_uart1)
128 - bcm63xx_uart_register(1);
130 if (board.has_pccard)
131 bcm63xx_pcmcia_register();
133 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
134 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
135 @@ -35,9 +35,6 @@ static struct board_info __initdata boar
136 .name = "CVG834G_E15R3921",
137 .expected_cpu_id = 0x3368,
145 @@ -67,7 +64,6 @@ static struct board_info __initdata boar
147 .expected_cpu_id = 0x6328,
152 .use_fallback_sprom = 1,
153 @@ -116,7 +112,6 @@ static struct board_info __initdata boar
155 .expected_cpu_id = 0x6338,
160 .force_speed_100 = 1,
161 @@ -159,7 +154,6 @@ static struct board_info __initdata boar
163 .expected_cpu_id = 0x6338,
168 .force_speed_100 = 1,
169 @@ -204,8 +198,6 @@ static struct board_info __initdata boar
170 static struct board_info __initdata board_96345gw2 = {
172 .expected_cpu_id = 0x6345,
178 @@ -217,7 +209,6 @@ static struct board_info __initdata boar
180 .expected_cpu_id = 0x6348,
185 .use_fallback_sprom = 1,
186 @@ -262,7 +253,6 @@ static struct board_info __initdata boar
187 .name = "96348GW-10",
188 .expected_cpu_id = 0x6348,
194 @@ -323,7 +313,6 @@ static struct board_info __initdata boar
195 .name = "96348GW-11",
196 .expected_cpu_id = 0x6348,
202 @@ -378,7 +367,6 @@ static struct board_info __initdata boar
204 .expected_cpu_id = 0x6348,
210 @@ -437,7 +425,6 @@ static struct board_info __initdata boar
212 .expected_cpu_id = 0x6348,
218 @@ -482,7 +469,6 @@ static struct board_info __initdata boar
220 .expected_cpu_id = 0x6348,
224 .use_fallback_sprom = 1,
226 @@ -503,7 +489,6 @@ static struct board_info __initdata boar
228 .expected_cpu_id = 0x6348,
234 @@ -530,7 +515,6 @@ static struct board_info __initdata boar
236 .expected_cpu_id = 0x6358,
242 @@ -583,7 +567,6 @@ static struct board_info __initdata boar
244 .expected_cpu_id = 0x6358,
250 @@ -633,7 +616,6 @@ static struct board_info __initdata boar
252 .expected_cpu_id = 0x6358,