| Message ID | 1404491651-1388-2-git-send-email-bigeasy@linutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 4 Jul 2014 18:34:09 +0200 Sebastian Andrzej Siewior <bigeasy@linutronix.de> wrote: > The OMAP version of the 8250 can actually use 1:1 serial8250_startup(). > However it needs to be extended by a wakeup irq which should to be > requested & enabled at ->startup() time. > > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Acked-by: Alan Cox <alan@linux.intel.com>
On 07/07/2014 03:09 PM, One Thousand Gnomes wrote: > On Fri, 4 Jul 2014 18:34:09 +0200 > Sebastian Andrzej Siewior <bigeasy@linutronix.de> wrote: > >> The OMAP version of the 8250 can actually use 1:1 serial8250_startup(). >> However it needs to be extended by a wakeup irq which should to be >> requested & enabled at ->startup() time. >> >> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> > > Acked-by: Alan Cox <alan@linux.intel.com> Thank you. I added to this patch the counterpart function (->shutdown) and therefore not yet adding the acked-by. Sebastian
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c index 0c90160..f731fff 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -1939,7 +1939,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 = container_of(port, struct uart_8250_port, port); @@ -2191,6 +2191,15 @@ static int serial8250_startup(struct uart_port *port) return 0; } +EXPORT_SYMBOL_GPL(serial8250_do_startup); + +static int serial8250_startup(struct uart_port *port) +{ + if (port->startup) + return port->startup(port); + else + return serial8250_do_startup(port); +} static void serial8250_shutdown(struct uart_port *port) { diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h index af47a8a..9afed1e 100644 --- a/include/linux/serial_8250.h +++ b/include/linux/serial_8250.h @@ -114,6 +114,7 @@ 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_pm(struct uart_port *port, unsigned int state, unsigned int oldstate); extern int fsl8250_handle_irq(struct uart_port *port); diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 5bbb809..77acd73 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -122,6 +122,7 @@ struct uart_port { void (*set_termios)(struct uart_port *, struct ktermios *new, struct ktermios *old); + int (*startup)(struct uart_port *port); int (*handle_irq)(struct uart_port *); void (*pm)(struct uart_port *, unsigned int state, unsigned int old);
The OMAP version of the 8250 can actually use 1:1 serial8250_startup(). However it needs to be extended by a wakeup irq which should to be requested & enabled at ->startup() time. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- drivers/tty/serial/8250/8250_core.c | 11 ++++++++++- include/linux/serial_8250.h | 1 + include/linux/serial_core.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-)