Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

serial: omap-serial: Enable the UART wake-up bits always

OMAP can do also dynamic idling so wake-up enable register should be set
also while system is running. If UART_OMAP_WER is not set, then for instance
the RX activity cannot wake up the UART port that is sleeping.

This RX wake-up feature was working when the 8250 driver was used instead
of omap-serial. Reason for this is that the 8250 doesn't set the
UART_OMAP_WER and then arch/arm/mach-omap2/pm34xx.c ends up saving and
restoring the reset default which is the same than value
OMAP_UART_WER_MOD_WKUP here.

Fix this by moving the conditional UART_OMAP_WER write from serial_omap_pm
into serial_omap_startup where wake-up bits are set unconditionally.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Govindraj.R <govindraj.raja@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Jarkko Nikula and committed by
Greg Kroah-Hartman
78841462 364a6ece

+3 -3
+3 -3
drivers/tty/serial/omap-serial.c
··· 520 520 up->ier = UART_IER_RLSI | UART_IER_RDI; 521 521 serial_out(up, UART_IER, up->ier); 522 522 523 + /* Enable module level wake up */ 524 + serial_out(up, UART_OMAP_WER, OMAP_UART_WER_MOD_WKUP); 525 + 523 526 up->port_activity = jiffies; 524 527 return 0; 525 528 } ··· 830 827 serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); 831 828 serial_out(up, UART_EFR, efr); 832 829 serial_out(up, UART_LCR, 0); 833 - /* Enable module level wake up */ 834 - serial_out(up, UART_OMAP_WER, 835 - (state != 0) ? OMAP_UART_WER_MOD_WKUP : 0); 836 830 } 837 831 838 832 static void serial_omap_release_port(struct uart_port *port)