Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 732a84a0 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

serial: core: Pass termios to set_ldisc() notifications 



UART drivers which enable modem status interrupts when switching
to N_PPS line discipline need to determine if modem status
interrupts should be disabled when switching from N_PPS.
Specifically, the set_ldisc() notification needs to evaluate
UART_ENABLE_MS() which requires termios->c_cflag.

Convert in-tree UART drivers to new interface.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db1b9dfc

drivers/tty/serial/8250/8250_core.c

+2 −2
Original line number Diff line number Diff line
@@ -2609,9 +2609,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, 
}



static void

serial8250_set_ldisc(struct uart_port *port, int new)

serial8250_set_ldisc(struct uart_port *port, struct ktermios *termios)

{

	if (new == N_PPS) {

	if (termios->c_line == N_PPS) {

		port->flags |= UPF_HARDPPS_CD;

		serial8250_enable_ms(port);

	} else

drivers/tty/serial/amba-pl010.c

+2 −2
Original line number Diff line number Diff line
@@ -479,9 +479,9 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios, 
	spin_unlock_irqrestore(&uap->port.lock, flags);

}



static void pl010_set_ldisc(struct uart_port *port, int new)

static void pl010_set_ldisc(struct uart_port *port, struct ktermios *termios)

{

	if (new == N_PPS) {

	if (termios->c_line == N_PPS) {

		port->flags |= UPF_HARDPPS_CD;

		pl010_enable_ms(port);

	} else

drivers/tty/serial/atmel_serial.c

+2 −2
Original line number Diff line number Diff line
@@ -2056,9 +2056,9 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, 
	spin_unlock_irqrestore(&port->lock, flags);

}



static void atmel_set_ldisc(struct uart_port *port, int new)

static void atmel_set_ldisc(struct uart_port *port, struct ktermios *termios)

{

	if (new == N_PPS) {

	if (termios->c_line == N_PPS) {

		port->flags |= UPF_HARDPPS_CD;

		atmel_enable_ms(port);

	} else {

drivers/tty/serial/bfin_uart.c

+3 −2
Original line number Diff line number Diff line
@@ -944,12 +944,13 @@ bfin_serial_verify_port(struct uart_port *port, struct serial_struct *ser) 
 * Enable the IrDA function if tty->ldisc.num is N_IRDA.

 * In other cases, disable IrDA function.

 */

static void bfin_serial_set_ldisc(struct uart_port *port, int ld)

static void bfin_serial_set_ldisc(struct uart_port *port,

				  struct ktermios *termios)

{

	struct bfin_serial_port *uart = (struct bfin_serial_port *)port;

	unsigned int val;



	switch (ld) {

	switch (termios->c_line) {

	case N_IRDA:

		val = UART_GET_GCTL(uart);

		val |= (UMOD_IRDA | RPOLC);

drivers/tty/serial/clps711x.c

+3 −2
Original line number Diff line number Diff line
@@ -225,13 +225,14 @@ static void uart_clps711x_break_ctl(struct uart_port *port, int break_state) 
	writel(ubrlcr, port->membase + UBRLCR_OFFSET);

}



static void uart_clps711x_set_ldisc(struct uart_port *port, int ld)

static void uart_clps711x_set_ldisc(struct uart_port *port,

				    struct ktermios *termios)

{

	if (!port->line) {

		struct clps711x_port *s = dev_get_drvdata(port->dev);



		regmap_update_bits(s->syscon, SYSCON_OFFSET, SYSCON1_SIREN,

				   (ld == N_IRDA) ? SYSCON1_SIREN : 0);

				   (termios->c_line == N_IRDA) ? SYSCON1_SIREN : 0);

	}

}