aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorThomas Weber <weber@corscience.de>2011-02-01 02:30:41 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-03 14:43:11 -0500
commit364a6ece62455f669336e50d5b00f14ba650da93 (patch)
treee2a206a2c6fe5a33d169d1484268629d9acbd2a0 /drivers/tty
parent2f1522eccb09188f0008168f75420bc2fedc9cae (diff)
OMAP: Enable Magic SysRq on serial console ttyOx
Magic SysRq key is not working for OMAP on new serial console ttyOx because SUPPORT_SYSRQ is not defined for omap-serial. This patch defines SUPPORT_SYSRQ in omap-serial and enables handling of Magic SysRq character. Further there is an issue of losing first break character. Removing the reset of the lsr_break_flag fixes this issue. Signed-off-by: Thomas Weber <weber@corscience.de> Acked-by: Govindraj.R <govindraj.raja@ti.com> Tested-by: Manjunath G Kondaiah <manjugk@ti.com> Acked-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/omap-serial.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 7f2f01058789..699b34446a55 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -20,6 +20,10 @@
20 * this driver as required for the omap-platform. 20 * this driver as required for the omap-platform.
21 */ 21 */
22 22
23#if defined(CONFIG_SERIAL_OMAP_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
24#define SUPPORT_SYSRQ
25#endif
26
23#include <linux/module.h> 27#include <linux/module.h>
24#include <linux/init.h> 28#include <linux/init.h>
25#include <linux/console.h> 29#include <linux/console.h>
@@ -190,7 +194,6 @@ static inline void receive_chars(struct uart_omap_port *up, int *status)
190 if (up->port.line == up->port.cons->index) { 194 if (up->port.line == up->port.cons->index) {
191 /* Recover the break flag from console xmit */ 195 /* Recover the break flag from console xmit */
192 lsr |= up->lsr_break_flag; 196 lsr |= up->lsr_break_flag;
193 up->lsr_break_flag = 0;
194 } 197 }
195#endif 198#endif
196 if (lsr & UART_LSR_BI) 199 if (lsr & UART_LSR_BI)