aboutsummaryrefslogtreecommitdiffstats
path: root/tty
diff options
authorLive-CD User <linux@linux.site>2009-09-19 11:23:34 -0700
committerLive-CD User <linux@linux.site>2009-09-19 11:23:34 -0700
commit775089d264ec103fe0c18467d95d7ba183857b95 (patch)
tree62b75aba03ff2d2201b8c1649d4f7f997b28b414 /tty
parent69679adbcb5ef5d531fd3487222a601002857c6e (diff)
downloadpatches-775089d264ec103fe0c18467d95d7ba183857b95.tar.gz
kay's patch for devtmpfs and resync with upstream
Diffstat (limited to 'tty')
-rw-r--r--tty/serial-8250-amstrad-e378
-rw-r--r--tty/serial-kill-info66
2 files changed, 33 insertions, 111 deletions
diff --git a/tty/serial-8250-amstrad-e3 b/tty/serial-8250-amstrad-e3
deleted file mode 100644
index 4d72d041cc4b14..00000000000000
--- a/tty/serial-8250-amstrad-e3
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
-Subject: OMAP1: AMS_DELTA: add modem support
-
-From: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
-
-This patch adds support for modem device found on Amstrad E3 (Delta) board.
-
-Based on earlier patch by Jonathan McDowell, available at
-http://the.earth.li/pub/e3/2.6.19/ams-delta-modem.patch.
-Modified after Ladislav Michl's arch/arm/mach-omap1/board-voiceblue.c.
-
-Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
-Signed-off-by: Alan Cox <alan@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
-
- arch/arm/mach-omap1/board-ams-delta.c | 38 +++++++++++++++++++++++++++++++++
- 1 files changed, 38 insertions(+), 0 deletions(-)
-
-
-diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
-index 8b40aac..10c2265 100644
---- a/arch/arm/mach-omap1/board-ams-delta.c
-+++ b/arch/arm/mach-omap1/board-ams-delta.c
-@@ -15,8 +15,11 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/input.h>
-+#include <linux/interrupt.h>
- #include <linux/platform_device.h>
-+#include <linux/serial_8250.h>
-
-+#include <asm/serial.h>
- #include <mach/hardware.h>
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
-@@ -235,6 +238,41 @@ static void __init ams_delta_init(void)
- platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
- }
-
-+static struct plat_serial8250_port ams_delta_modem_ports[] = {
-+ {
-+ .membase = (void *) AMS_DELTA_MODEM_VIRT,
-+ .mapbase = AMS_DELTA_MODEM_PHYS,
-+ .irq = -EINVAL, /* changed later */
-+ .flags = UPF_BOOT_AUTOCONF,
-+ .irqflags = IRQF_TRIGGER_RISING,
-+ .iotype = UPIO_MEM,
-+ .regshift = 1,
-+ .uartclk = BASE_BAUD * 16,
-+ },
-+ { },
-+};
-+
-+static struct platform_device ams_delta_modem_device = {
-+ .name = "serial8250",
-+ .id = PLAT8250_DEV_PLATFORM1,
-+ .dev = {
-+ .platform_data = ams_delta_modem_ports,
-+ },
-+};
-+
-+static int __init ams_delta_modem_init(void)
-+{
-+ omap_cfg_reg(M14_1510_GPIO2);
-+ ams_delta_modem_ports[0].irq = gpio_to_irq(2);
-+
-+ ams_delta_latch2_write(
-+ AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC,
-+ AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC);
-+
-+ return platform_device_register(&ams_delta_modem_device);
-+}
-+arch_initcall(ams_delta_modem_init);
-+
- static void __init ams_delta_map_io(void)
- {
- omap1_map_common_io();
diff --git a/tty/serial-kill-info b/tty/serial-kill-info
index f20418d93b1d6c..ad1d56db46e7e5 100644
--- a/tty/serial-kill-info
+++ b/tty/serial-kill-info
@@ -109,7 +109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
-@@ -1382,7 +1382,7 @@ static void serial8250_enable_ms(struct
+@@ -1382,7 +1382,7 @@ static void serial8250_enable_ms(struct
static void
receive_chars(struct uart_8250_port *up, unsigned int *status)
{
@@ -249,7 +249,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct atmel_dma_buffer *pdc;
int rx_idx = atmel_port->pdc_rx_idx;
unsigned int head;
-@@ -776,7 +776,7 @@ static void atmel_tasklet_func(unsigned
+@@ -776,7 +776,7 @@ static void atmel_tasklet_func(unsigned
if (status_change & ATMEL_US_CTS)
uart_handle_cts_change(port, !(status & ATMEL_US_CTS));
@@ -258,7 +258,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
atmel_port->irq_status_prev = status;
}
-@@ -795,7 +795,7 @@ static void atmel_tasklet_func(unsigned
+@@ -795,7 +795,7 @@ static void atmel_tasklet_func(unsigned
static int atmel_startup(struct uart_port *port)
{
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
@@ -296,7 +296,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
if (uart->scts && !(bfin_serial_get_mctrl(&uart->port) & TIOCM_CTS)) {
-@@ -243,10 +243,10 @@ static void bfin_serial_rx_chars(struct
+@@ -243,10 +243,10 @@ static void bfin_serial_rx_chars(struct
return;
}
@@ -309,7 +309,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (ANOMALY_05000363) {
/* The BF533 (and BF561) family of processors have a nice anomaly
-@@ -331,7 +331,7 @@ static void bfin_serial_rx_chars(struct
+@@ -331,7 +331,7 @@ static void bfin_serial_rx_chars(struct
static void bfin_serial_tx_chars(struct bfin_serial_port *uart)
{
@@ -560,7 +560,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned long flags, temp;
spin_lock_irqsave(&sport->port.lock,flags);
-@@ -900,11 +900,11 @@ imx_set_termios(struct uart_port *port,
+@@ -900,11 +900,11 @@ imx_set_termios(struct uart_port *port,
rational_best_approximation(16 * div * baud, sport->port.uartclk,
1 << 16, 1 << 16, &num, &denom);
@@ -691,7 +691,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
read_count = do_read(the_port, ch, MAX_CHARS);
if (read_count > 0) {
-@@ -1491,7 +1491,7 @@ ioc3uart_intr_one(struct ioc3_submodule
+@@ -1491,7 +1491,7 @@ ioc3uart_intr_one(struct ioc3_submodule
uart_handle_dcd_change(the_port,
shadow & SHADOW_DCD);
wake_up_interruptible
@@ -700,7 +700,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
} else if ((port->ip_notify & N_DDCD)
&& !(shadow & SHADOW_DCD)) {
/* Flag delta DCD/no DCD */
-@@ -1511,7 +1511,7 @@ ioc3uart_intr_one(struct ioc3_submodule
+@@ -1511,7 +1511,7 @@ ioc3uart_intr_one(struct ioc3_submodule
uart_handle_cts_change(the_port, shadow
& SHADOW_CTS);
wake_up_interruptible
@@ -910,7 +910,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
spin_lock_irqsave(&the_port->lock, port_flags);
set_notification(port, N_ALL, 0);
-@@ -2538,7 +2538,7 @@ static int ic4_startup(struct uart_port
+@@ -2538,7 +2538,7 @@ static int ic4_startup(struct uart_port
int retval;
struct ioc4_port *port;
struct ioc4_control *control;
@@ -919,7 +919,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned long port_flags;
if (!the_port)
-@@ -2546,7 +2546,7 @@ static int ic4_startup(struct uart_port
+@@ -2546,7 +2546,7 @@ static int ic4_startup(struct uart_port
port = get_ioc4_port(the_port, 1);
if (!port)
return -ENODEV;
@@ -1177,7 +1177,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* Send special char - probably flow control */
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
-@@ -745,7 +745,7 @@ static struct uart_ops mpc52xx_uart_ops
+@@ -745,7 +745,7 @@ static struct uart_ops mpc52xx_uart_ops
static inline int
mpc52xx_uart_int_rx_chars(struct uart_port *port)
{
@@ -1284,7 +1284,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
netx_stop_tx(port);
-@@ -201,7 +201,7 @@ static void netx_txint(struct uart_port
+@@ -201,7 +201,7 @@ static void netx_txint(struct uart_port
static void netx_rxint(struct uart_port *port)
{
unsigned char rx, flg, status;
@@ -1409,7 +1409,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned int ch, flag;
int max_count = 256;
-@@ -161,7 +161,7 @@ static inline void receive_chars(struct
+@@ -161,7 +161,7 @@ static inline void receive_chars(struct
static void transmit_chars(struct uart_pxa_port *up)
{
@@ -1595,7 +1595,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned long flags;
spin_lock_irqsave(&port->lock, flags);
-@@ -94,9 +94,9 @@ static void uart_stop(struct tty_struct
+@@ -94,9 +94,9 @@ static void uart_stop(struct tty_struct
static void __uart_start(struct tty_struct *tty)
{
struct uart_state *state = tty->driver_data;
@@ -2120,7 +2120,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned long char_time, expire;
if (port->type == PORT_UNKNOWN || port->fifosize == 0)
-@@ -1412,20 +1410,19 @@ static void uart_wait_until_sent(struct
+@@ -1412,20 +1410,19 @@ static void uart_wait_until_sent(struct
static void uart_hangup(struct tty_struct *tty)
{
struct uart_state *state = tty->driver_data;
@@ -2191,7 +2191,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
break;
/*
-@@ -1506,8 +1502,8 @@ uart_block_til_ready(struct file *filp,
+@@ -1506,8 +1502,8 @@ uart_block_til_ready(struct file *filp,
* have set TTY_IO_ERROR for a non-existant port.
*/
if ((filp->f_flags & O_NONBLOCK) ||
@@ -2202,7 +2202,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
break;
/*
-@@ -1515,7 +1511,7 @@ uart_block_til_ready(struct file *filp,
+@@ -1515,7 +1511,7 @@ uart_block_til_ready(struct file *filp,
* not set RTS here - we want to make sure we catch
* the data from the modem.
*/
@@ -2211,7 +2211,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
uart_set_mctrl(port, TIOCM_DTR);
/*
-@@ -1537,15 +1533,15 @@ uart_block_til_ready(struct file *filp,
+@@ -1537,15 +1533,15 @@ uart_block_til_ready(struct file *filp,
break;
}
set_current_state(TASK_RUNNING);
@@ -2310,7 +2310,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| UIF_SUSPENDED;
spin_lock_irq(&port->lock);
-@@ -2084,15 +2081,15 @@ int uart_resume_port(struct uart_driver
+@@ -2084,15 +2081,15 @@ int uart_resume_port(struct uart_driver
/*
* If that's unset, use the tty termios setting.
*/
@@ -2329,7 +2329,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
const struct uart_ops *ops = port->ops;
int ret;
-@@ -2107,7 +2104,7 @@ int uart_resume_port(struct uart_driver
+@@ -2107,7 +2104,7 @@ int uart_resume_port(struct uart_driver
ops->set_mctrl(port, port->mctrl);
ops->start_tx(port);
spin_unlock_irq(&port->lock);
@@ -2338,7 +2338,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
} else {
/*
* Failed to resume - maybe hardware went away?
-@@ -2117,7 +2114,7 @@ int uart_resume_port(struct uart_driver
+@@ -2117,7 +2114,7 @@ int uart_resume_port(struct uart_driver
uart_shutdown(state);
}
@@ -2540,7 +2540,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (up->port.x_char) {
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
-@@ -360,7 +360,7 @@ static inline int sci_rxroom(struct uart
+@@ -361,7 +361,7 @@ static inline int sci_rxroom(struct uart
static void sci_transmit_chars(struct uart_port *port)
{
@@ -2549,7 +2549,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned int stopped = uart_tx_stopped(port);
unsigned short status;
unsigned short ctrl;
-@@ -425,7 +425,7 @@ static void sci_transmit_chars(struct ua
+@@ -426,7 +426,7 @@ static void sci_transmit_chars(struct ua
static inline void sci_receive_chars(struct uart_port *port)
{
struct sci_port *sci_port = to_sci_port(port);
@@ -2558,7 +2558,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
int i, count, copied = 0;
unsigned short status;
unsigned char flag;
-@@ -545,7 +545,7 @@ static inline int sci_handle_errors(stru
+@@ -546,7 +546,7 @@ static inline int sci_handle_errors(stru
{
int copied = 0;
unsigned short status = sci_in(port, SCxSR);
@@ -2567,7 +2567,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (status & SCxSR_ORER(port)) {
/* overrun error */
-@@ -599,7 +599,7 @@ static inline int sci_handle_errors(stru
+@@ -600,7 +600,7 @@ static inline int sci_handle_errors(stru
static inline int sci_handle_fifo_overrun(struct uart_port *port)
{
@@ -2576,7 +2576,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
int copied = 0;
if (port->type != PORT_SCIF)
-@@ -622,7 +622,7 @@ static inline int sci_handle_breaks(stru
+@@ -623,7 +623,7 @@ static inline int sci_handle_breaks(stru
{
int copied = 0;
unsigned short status = sci_in(port, SCxSR);
@@ -2827,7 +2827,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (uart_circ_empty(xmit) || uart_tx_stopped(port))
return;
-@@ -231,7 +231,7 @@ static void timbuart_mctrl_check(struct
+@@ -231,7 +231,7 @@ static void timbuart_mctrl_check(struct
iowrite32(CTS_DELTA, port->membase + TIMBUART_ISR);
cts = timbuart_get_mctrl(port);
uart_handle_cts_change(port, cts & TIOCM_CTS);
@@ -2887,7 +2887,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
unsigned int flg;
--- a/drivers/serial/vr41xx_siu.c
+++ b/drivers/serial/vr41xx_siu.c
-@@ -318,7 +318,7 @@ static inline void receive_chars(struct
+@@ -318,7 +318,7 @@ static inline void receive_chars(struct
char flag;
int max_count = RX_MAX_COUNT;
@@ -3009,7 +3009,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct mutex mutex;
};
-@@ -462,7 +458,7 @@ int uart_resume_port(struct uart_driver
+@@ -462,7 +458,7 @@ int uart_resume_port(struct uart_driver
static inline int uart_tx_stopped(struct uart_port *port)
{
@@ -3018,7 +3018,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if(tty->stopped || tty->hw_stopped)
return 1;
return 0;
-@@ -477,7 +473,7 @@ uart_handle_sysrq_char(struct uart_port
+@@ -477,7 +473,7 @@ uart_handle_sysrq_char(struct uart_port
#ifdef SUPPORT_SYSRQ
if (port->sysrq) {
if (ch && time_before(jiffies, port->sysrq)) {
@@ -3027,7 +3027,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
port->sysrq = 0;
return 1;
}
-@@ -495,7 +491,7 @@ uart_handle_sysrq_char(struct uart_port
+@@ -495,7 +491,7 @@ uart_handle_sysrq_char(struct uart_port
*/
static inline int uart_handle_break(struct uart_port *port)
{
@@ -3054,7 +3054,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
port->icount.dcd++;
-@@ -527,11 +523,11 @@ uart_handle_dcd_change(struct uart_port
+@@ -527,11 +523,11 @@ uart_handle_dcd_change(struct uart_port
hardpps();
#endif
@@ -3070,7 +3070,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
}
-@@ -543,12 +539,12 @@ uart_handle_dcd_change(struct uart_port
+@@ -543,12 +539,12 @@ uart_handle_dcd_change(struct uart_port
static inline void
uart_handle_cts_change(struct uart_port *port, unsigned int status)
{
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:20:50 +0000