diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2008-04-03 16:02:53 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-04-28 12:14:28 -0400 |
commit | 6e766458f78ca15198cf046bc098b36e40c8b471 (patch) | |
tree | 7cc0909addd8f44a8d550acff79f65ddceecf2f2 /drivers | |
parent | ce28f94ca5a9ba3cd6bdcc47b52ea1b7a3bd933b (diff) |
[MIPS] Alchemy: move UART platform code to its proper place
Move the code registering the Alchemy UART platform devices from
drivers/serial/ to its proper place, into the Alchemy platform code. Fix
the related Kconfig entry, while at it...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/serial/8250_au1x00.c | 100 | ||||
-rw-r--r-- | drivers/serial/Kconfig | 8 | ||||
-rw-r--r-- | drivers/serial/Makefile | 1 |
3 files changed, 4 insertions, 105 deletions
diff --git a/drivers/serial/8250_au1x00.c b/drivers/serial/8250_au1x00.c deleted file mode 100644 index 58015fd14be9..000000000000 --- a/drivers/serial/8250_au1x00.c +++ /dev/null | |||
@@ -1,100 +0,0 @@ | |||
1 | /* | ||
2 | * Serial Device Initialisation for Au1x00 | ||
3 | * | ||
4 | * (C) Copyright Embedded Alley Solutions, Inc 2005 | ||
5 | * Author: Pantelis Antoniou <pantelis@embeddedalley.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | */ | ||
12 | |||
13 | #include <linux/errno.h> | ||
14 | #include <linux/init.h> | ||
15 | #include <linux/interrupt.h> | ||
16 | #include <linux/ioport.h> | ||
17 | #include <linux/module.h> | ||
18 | #include <linux/serial_core.h> | ||
19 | #include <linux/signal.h> | ||
20 | #include <linux/slab.h> | ||
21 | #include <linux/types.h> | ||
22 | |||
23 | #include <linux/serial_8250.h> | ||
24 | |||
25 | #include <asm/mach-au1x00/au1000.h> | ||
26 | |||
27 | #include "8250.h" | ||
28 | |||
29 | #define PORT(_base, _irq) \ | ||
30 | { \ | ||
31 | .iobase = _base, \ | ||
32 | .membase = (void __iomem *)_base,\ | ||
33 | .mapbase = CPHYSADDR(_base), \ | ||
34 | .irq = _irq, \ | ||
35 | .uartclk = 0, /* filled */ \ | ||
36 | .regshift = 2, \ | ||
37 | .iotype = UPIO_AU, \ | ||
38 | .flags = UPF_SKIP_TEST \ | ||
39 | } | ||
40 | |||
41 | static struct plat_serial8250_port au1x00_data[] = { | ||
42 | #if defined(CONFIG_SOC_AU1000) | ||
43 | PORT(UART0_ADDR, AU1000_UART0_INT), | ||
44 | PORT(UART1_ADDR, AU1000_UART1_INT), | ||
45 | PORT(UART2_ADDR, AU1000_UART2_INT), | ||
46 | PORT(UART3_ADDR, AU1000_UART3_INT), | ||
47 | #elif defined(CONFIG_SOC_AU1500) | ||
48 | PORT(UART0_ADDR, AU1500_UART0_INT), | ||
49 | PORT(UART3_ADDR, AU1500_UART3_INT), | ||
50 | #elif defined(CONFIG_SOC_AU1100) | ||
51 | PORT(UART0_ADDR, AU1100_UART0_INT), | ||
52 | PORT(UART1_ADDR, AU1100_UART1_INT), | ||
53 | /* The internal UART2 does not exist on the AU1100 processor. */ | ||
54 | PORT(UART3_ADDR, AU1100_UART3_INT), | ||
55 | #elif defined(CONFIG_SOC_AU1550) | ||
56 | PORT(UART0_ADDR, AU1550_UART0_INT), | ||
57 | PORT(UART1_ADDR, AU1550_UART1_INT), | ||
58 | PORT(UART3_ADDR, AU1550_UART3_INT), | ||
59 | #elif defined(CONFIG_SOC_AU1200) | ||
60 | PORT(UART0_ADDR, AU1200_UART0_INT), | ||
61 | PORT(UART1_ADDR, AU1200_UART1_INT), | ||
62 | #endif | ||
63 | { }, | ||
64 | }; | ||
65 | |||
66 | static struct platform_device au1x00_device = { | ||
67 | .name = "serial8250", | ||
68 | .id = PLAT8250_DEV_AU1X00, | ||
69 | .dev = { | ||
70 | .platform_data = au1x00_data, | ||
71 | }, | ||
72 | }; | ||
73 | |||
74 | static int __init au1x00_init(void) | ||
75 | { | ||
76 | int i; | ||
77 | unsigned int uartclk; | ||
78 | |||
79 | /* get uart clock */ | ||
80 | uartclk = get_au1x00_uart_baud_base() * 16; | ||
81 | |||
82 | /* fill up uartclk */ | ||
83 | for (i = 0; au1x00_data[i].flags ; i++) | ||
84 | au1x00_data[i].uartclk = uartclk; | ||
85 | |||
86 | return platform_device_register(&au1x00_device); | ||
87 | } | ||
88 | |||
89 | /* XXX: Yes, I know this doesn't yet work. */ | ||
90 | static void __exit au1x00_exit(void) | ||
91 | { | ||
92 | platform_device_unregister(&au1x00_device); | ||
93 | } | ||
94 | |||
95 | module_init(au1x00_init); | ||
96 | module_exit(au1x00_exit); | ||
97 | |||
98 | MODULE_AUTHOR("Pantelis Antoniou <pantelis@embeddedalley.com>"); | ||
99 | MODULE_DESCRIPTION("8250 serial probe module for Au1x000 cards"); | ||
100 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index f7cd9504d811..34b809e3b596 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -262,12 +262,12 @@ config SERIAL_8250_ACORN | |||
262 | cards. If unsure, say N. | 262 | cards. If unsure, say N. |
263 | 263 | ||
264 | config SERIAL_8250_AU1X00 | 264 | config SERIAL_8250_AU1X00 |
265 | bool "AU1X00 serial port support" | 265 | bool "Au1x00 serial port support" |
266 | depends on SERIAL_8250 != n && SOC_AU1X00 | 266 | depends on SERIAL_8250 != n && SOC_AU1X00 |
267 | help | 267 | help |
268 | If you have an Au1x00 board and want to use the serial port, say Y | 268 | If you have an Au1x00 SOC based board and want to use the serial port, |
269 | to this option. The driver can handle 1 or 2 serial ports. | 269 | say Y to this option. The driver can handle up to 4 serial ports, |
270 | If unsure, say N. | 270 | depending on the SOC. If unsure, say N. |
271 | 271 | ||
272 | config SERIAL_8250_RM9K | 272 | config SERIAL_8250_RM9K |
273 | bool "Support for MIPS RM9xxx integrated serial port" | 273 | bool "Support for MIPS RM9xxx integrated serial port" |
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 3cbea5494724..f02ff9fad017 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile | |||
@@ -20,7 +20,6 @@ obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o | |||
20 | obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o | 20 | obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o |
21 | obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o | 21 | obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o |
22 | obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o | 22 | obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o |
23 | obj-$(CONFIG_SERIAL_8250_AU1X00) += 8250_au1x00.o | ||
24 | obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o | 23 | obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o |
25 | obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o | 24 | obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o |
26 | obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o | 25 | obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o |