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

Commit 64e9159f authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

serial_core: uart_set_ldisc infrastructure 



The tty layer provides a callback that is used when the line discipline
is changed. Some hardware uses this to configure hardware specific
features such as IrDA mode on serial ports. Unfortunately the serial
layer does not provide this feature or pass it down to drivers.

Blackfin used to hack around this by rewriting the tty ops, but those are
now properly shared and const so the hack fails. Instead provide the
proper operations.

This change plus a follow up from the Blackfin guys is needed to avoid
blackfin losing features in this release.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4b34fe15

drivers/serial/serial_core.c

+10 −0
Original line number Diff line number Diff line
@@ -1165,6 +1165,15 @@ uart_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, 
	return ret;

}



static void uart_set_ldisc(struct tty_struct *tty, int ldisc)

{

	struct uart_state *state = tty->driver_data;

	struct uart_port *port = state->port;



	if (port->ops->set_ldisc)

		port->ops->set_ldisc(port);

}



static void uart_set_termios(struct tty_struct *tty,

						struct ktermios *old_termios)

{
@@ -2288,6 +2297,7 @@ static const struct tty_operations uart_ops = { 
	.unthrottle	= uart_unthrottle,

	.send_xchar	= uart_send_xchar,

	.set_termios	= uart_set_termios,

	.set_ldisc	= uart_set_ldisc,

	.stop		= uart_stop,

	.start		= uart_start,

	.hangup		= uart_hangup,

include/linux/serial_core.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ struct uart_ops { 
	void		(*shutdown)(struct uart_port *);

	void		(*set_termios)(struct uart_port *, struct ktermios *new,

				       struct ktermios *old);

	void		(*set_ldisc)(struct uart_port *);

	void		(*pm)(struct uart_port *, unsigned int state,

			      unsigned int oldstate);

	int		(*set_wake)(struct uart_port *, unsigned int state);