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

Commit b99b121b authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Greg Kroah-Hartman
Browse files

tty: serial: 8250_core: allow to overwrite & export serial8250_startup() 



The OMAP version of the 8250 can actually use 1:1 serial8250_startup().
However it needs to be extended by a wake up irq which should to be
requested & enabled at ->startup() time and disabled at ->shutdown() time.

v2…v3: properly copy callbacks
v1…v2: add shutdown callback

Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae14a795

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

+23 −2
Original line number Diff line number Diff line
@@ -1930,7 +1930,7 @@ static void serial8250_put_poll_char(struct uart_port *port, 


#endif /* CONFIG_CONSOLE_POLL */



static int serial8250_startup(struct uart_port *port)

int serial8250_do_startup(struct uart_port *port)

{

	struct uart_8250_port *up = up_to_u8250p(port);

	unsigned long flags;
@@ -2181,8 +2181,16 @@ static int serial8250_startup(struct uart_port *port) 


	return 0;

}

EXPORT_SYMBOL_GPL(serial8250_do_startup);



static void serial8250_shutdown(struct uart_port *port)

static int serial8250_startup(struct uart_port *port)

{

	if (port->startup)

		return port->startup(port);

	return serial8250_do_startup(port);

}



void serial8250_do_shutdown(struct uart_port *port)

{

	struct uart_8250_port *up = up_to_u8250p(port);

	unsigned long flags;
@@ -2232,6 +2240,15 @@ static void serial8250_shutdown(struct uart_port *port) 
	if (port->irq)

		serial_unlink_irq_chain(up);

}

EXPORT_SYMBOL_GPL(serial8250_do_shutdown);



static void serial8250_shutdown(struct uart_port *port)

{

	if (port->shutdown)

		port->shutdown(port);

	else

		serial8250_do_shutdown(port);

}



static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int baud)

{
@@ -3466,6 +3483,10 @@ int serial8250_register_8250_port(struct uart_8250_port *up) 
		/*  Possibly override set_termios call */

		if (up->port.set_termios)

			uart->port.set_termios = up->port.set_termios;

		if (up->port.startup)

			uart->port.startup = up->port.startup;

		if (up->port.shutdown)

			uart->port.shutdown = up->port.shutdown;

		if (up->port.pm)

			uart->port.pm = up->port.pm;

		if (up->port.handle_break)

include/linux/serial_8250.h

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ extern void serial8250_early_out(struct uart_port *port, int offset, int value); 
extern int setup_early_serial8250_console(char *cmdline);

extern void serial8250_do_set_termios(struct uart_port *port,

		struct ktermios *termios, struct ktermios *old);

extern int serial8250_do_startup(struct uart_port *port);

extern void serial8250_do_shutdown(struct uart_port *port);

extern void serial8250_do_pm(struct uart_port *port, unsigned int state,

			     unsigned int oldstate);

extern int fsl8250_handle_irq(struct uart_port *port);

include/linux/serial_core.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ struct uart_port { 
	void			(*set_termios)(struct uart_port *,

				               struct ktermios *new,

				               struct ktermios *old);

	int			(*startup)(struct uart_port *port);

	void			(*shutdown)(struct uart_port *port);

	int			(*handle_irq)(struct uart_port *);

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

				      unsigned int old);