diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-03-26 15:25:57 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-26 15:25:57 -0500 |
| commit | 335bd9dff31d042b773591933d3ee5bd62d5ea27 (patch) | |
| tree | d90228d7e8853bbc0a32f45352eb34602da943af | |
| parent | 8faaea3faa5ed0b2a15afb7b4e57ce0cd8dbe4ef (diff) | |
[SERIAL] Remove obsoleted au1x00_uart driver
As announced in feature-removal-schedule.txt.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/mips/au1000/common/setup.c | 2 | ||||
| -rw-r--r-- | drivers/serial/Kconfig | 16 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 1 | ||||
| -rw-r--r-- | drivers/serial/au1x00_uart.c | 1287 | ||||
| -rw-r--r-- | include/asm-mips/serial.h | 85 |
5 files changed, 2 insertions, 1389 deletions
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index 1080558c8100..307e98c29ddc 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c | |||
| @@ -94,7 +94,7 @@ void __init plat_setup(void) | |||
| 94 | 94 | ||
| 95 | argptr = prom_getcmdline(); | 95 | argptr = prom_getcmdline(); |
| 96 | 96 | ||
| 97 | #if defined(CONFIG_SERIAL_AU1X00_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) | 97 | #ifdef CONFIG_SERIAL_8250_CONSOLE |
| 98 | if ((argptr = strstr(argptr, "console=")) == NULL) { | 98 | if ((argptr = strstr(argptr, "console=")) == NULL) { |
| 99 | argptr = prom_getcmdline(); | 99 | argptr = prom_getcmdline(); |
| 100 | strcat(argptr, " console=ttyS0,115200"); | 100 | strcat(argptr, " console=ttyS0,115200"); |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index ceb3697bf84d..fe0d8b8e91c8 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
| @@ -620,22 +620,6 @@ config SERIAL_SH_SCI_CONSOLE | |||
| 620 | depends on SERIAL_SH_SCI=y | 620 | depends on SERIAL_SH_SCI=y |
| 621 | select SERIAL_CORE_CONSOLE | 621 | select SERIAL_CORE_CONSOLE |
| 622 | 622 | ||
| 623 | config SERIAL_AU1X00 | ||
| 624 | bool "Enable Au1x00 UART Support" | ||
| 625 | depends on MIPS && SOC_AU1X00 | ||
| 626 | select SERIAL_CORE | ||
| 627 | help | ||
| 628 | If you have an Alchemy AU1X00 processor (MIPS based) and you want | ||
| 629 | to use serial ports, say Y. Otherwise, say N. | ||
| 630 | |||
| 631 | config SERIAL_AU1X00_CONSOLE | ||
| 632 | bool "Enable Au1x00 serial console" | ||
| 633 | depends on SERIAL_AU1X00 | ||
| 634 | select SERIAL_CORE_CONSOLE | ||
| 635 | help | ||
| 636 | If you have an Alchemy AU1X00 processor (MIPS based) and you want | ||
| 637 | to use a console on a serial port, say Y. Otherwise, say N. | ||
| 638 | |||
| 639 | config SERIAL_CORE | 623 | config SERIAL_CORE |
| 640 | tristate | 624 | tristate |
| 641 | 625 | ||
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index a3a4323d9c86..d2b4c214876b 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile | |||
| @@ -41,7 +41,6 @@ obj-$(CONFIG_SERIAL_COLDFIRE) += mcfserial.o | |||
| 41 | obj-$(CONFIG_V850E_UART) += v850e_uart.o | 41 | obj-$(CONFIG_V850E_UART) += v850e_uart.o |
| 42 | obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o | 42 | obj-$(CONFIG_SERIAL_PMACZILOG) += pmac_zilog.o |
| 43 | obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o | 43 | obj-$(CONFIG_SERIAL_LH7A40X) += serial_lh7a40x.o |
| 44 | obj-$(CONFIG_SERIAL_AU1X00) += au1x00_uart.o | ||
| 45 | obj-$(CONFIG_SERIAL_DZ) += dz.o | 44 | obj-$(CONFIG_SERIAL_DZ) += dz.o |
| 46 | obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o | 45 | obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o |
| 47 | obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o | 46 | obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o |
diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c deleted file mode 100644 index 948880ac5878..000000000000 --- a/drivers/serial/au1x00_uart.c +++ /dev/null | |||
| @@ -1,1287 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Driver for 8250/16550-type serial ports | ||
| 3 | * | ||
| 4 | * Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o. | ||
| 5 | * | ||
| 6 | * Copyright (C) 2001 Russell King. | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation; either version 2 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * A note about mapbase / membase | ||
| 14 | * | ||
| 15 | * mapbase is the physical address of the IO port. Currently, we don't | ||
| 16 | * support this very well, and it may well be dropped from this driver | ||
| 17 | * in future. As such, mapbase should be NULL. | ||
| 18 | * | ||
| 19 | * membase is an 'ioremapped' cookie. This is compatible with the old | ||
| 20 | * serial.c driver, and is currently the preferred form. | ||
| 21 | */ | ||
| 22 | #include <linux/config.h> | ||
| 23 | #include <linux/module.h> | ||
| 24 | #include <linux/tty.h> | ||
| 25 | #include <linux/ioport.h> | ||
| 26 | #include <linux/init.h> | ||
| 27 | #include <linux/console.h> | ||
| 28 | #include <linux/sysrq.h> | ||
| 29 | #include <linux/serial.h> | ||
| 30 | #include <linux/serialP.h> | ||
| 31 | #include <linux/delay.h> | ||
| 32 | |||
| 33 | #include <asm/serial.h> | ||
| 34 | #include <asm/io.h> | ||
| 35 | #include <asm/irq.h> | ||
| 36 | #include <asm/mach-au1x00/au1000.h> | ||
| 37 | |||
| 38 | #if defined(CONFIG_SERIAL_AU1X00_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | ||
| 39 | #define SUPPORT_SYSRQ | ||
| 40 | #endif | ||
| 41 | |||
| 42 | #include <linux/serial_core.h> | ||
| 43 | #include "8250.h" | ||
| 44 | |||
| 45 | /* | ||
| 46 | * Debugging. | ||
| 47 | */ | ||
| 48 | #if 0 | ||
| 49 | #define DEBUG_AUTOCONF(fmt...) printk(fmt) | ||
| 50 | #else | ||
| 51 | #define DEBUG_AUTOCONF(fmt...) do { } while (0) | ||
| 52 | #endif | ||
| 53 | |||
| 54 | #if 0 | ||
| 55 | #define DEBUG_INTR(fmt...) printk(fmt) | ||
| 56 | #else | ||
| 57 | #define DEBUG_INTR(fmt...) do { } while (0) | ||
| 58 | #endif | ||
| 59 | |||
| 60 | #define PASS_LIMIT 256 | ||
| 61 | |||
| 62 | /* | ||
| 63 | * We default to IRQ0 for the "no irq" hack. Some | ||
| 64 | * machine types want others as well - they're free | ||
| 65 | * to redefine this in their header file. | ||
| 66 | */ | ||
| 67 | #define is_real_interrupt(irq) ((irq) != 0) | ||
| 68 | |||
| 69 | static struct old_serial_port old_serial_port[] = { | ||
| 70 | { .baud_base = 0, | ||
| 71 | .iomem_base = (u8 *)UART0_ADDR, | ||
| 72 | .irq = AU1000_UART0_INT, | ||
| 73 | .flags = STD_COM_FLAGS, | ||
| 74 | .iomem_reg_shift = 2, | ||
| 75 | }, { | ||
| 76 | .baud_base = 0, | ||
| 77 | .iomem_base = (u8 *)UART1_ADDR, | ||
| 78 | .irq = AU1000_UART1_INT, | ||
| 79 | .flags = STD_COM_FLAGS, | ||
| 80 | .iomem_reg_shift = 2 | ||
| 81 | }, { | ||
| 82 | .baud_base = 0, | ||
| 83 | .iomem_base = (u8 *)UART2_ADDR, | ||
| 84 | .irq = AU1000_UART2_INT, | ||
| 85 | .flags = STD_COM_FLAGS, | ||
| 86 | .iomem_reg_shift = 2 | ||
| 87 | }, { | ||
| 88 | .baud_base = 0, | ||
| 89 | .iomem_base = (u8 *)UART3_ADDR, | ||
| 90 | .irq = AU1000_UART3_INT, | ||
| 91 | .flags = STD_COM_FLAGS, | ||
| 92 | .iomem_reg_shift = 2 | ||
| 93 | } | ||
| 94 | }; | ||
| 95 | |||
| 96 | #define UART_NR ARRAY_SIZE(old_serial_port) | ||
| 97 | |||
| 98 | struct uart_8250_port { | ||
| 99 | struct uart_port port; | ||
| 100 | struct timer_list timer; /* "no irq" timer */ | ||
| 101 | struct list_head list; /* ports on this IRQ */ | ||
| 102 | unsigned short rev; | ||
| 103 | unsigned char acr; | ||
| 104 | unsigned char ier; | ||
| 105 | unsigned char lcr; | ||
| 106 | unsigned char mcr_mask; /* mask of user bits */ | ||
| 107 | unsigned char mcr_force; /* mask of forced bits */ | ||
| 108 | unsigned char lsr_break_flag; | ||
| 109 | |||
| 110 | /* | ||
| 111 | * We provide a per-port pm hook. | ||
| 112 | */ | ||
| 113 | void (*pm)(struct uart_port *port, | ||
| 114 | unsigned int state, unsigned int old); | ||
| 115 | }; | ||
| 116 | |||
| 117 | struct irq_info { | ||
| 118 | spinlock_t lock; | ||
| 119 | struct list_head *head; | ||
| 120 | }; | ||
| 121 | |||
| 122 | static struct irq_info irq_lists[NR_IRQS]; | ||
| 123 | |||
| 124 | /* | ||
| 125 | * Here we define the default xmit fifo size used for each type of UART. | ||
| 126 | */ | ||
| 127 | static const struct serial_uart_config uart_config[PORT_MAX_8250+1] = { | ||
| 128 | { "unknown", 1, 0 }, | ||
| 129 | { "8250", 1, 0 }, | ||
| 130 | { "16450", 1, 0 }, | ||
| 131 | { "16550", 1, 0 }, | ||
| 132 | /* PORT_16550A */ | ||
| 133 | { "AU1X00_UART",16, UART_CLEAR_FIFO | UART_USE_FIFO }, | ||
| 134 | }; | ||
| 135 | |||
| 136 | static unsigned int serial_in(struct uart_8250_port *up, int offset) | ||
| 137 | { | ||
| 138 | return au_readl((unsigned long)up->port.membase + offset); | ||
