disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/tty/serial/mxs-auart.c
..
..
@@ -12,10 +12,6 @@
12
12
  * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
13
13
  */
14
14
 
15
-#if defined(CONFIG_SERIAL_MXS_AUART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
16
-#define SUPPORT_SYSRQ
17
-#endif
18
-
19
15
 #include <linux/kernel.h>
20
16
 #include <linux/errno.h>
21
17
 #include <linux/init.h>
..
..
@@ -969,10 +965,8 @@
969
965
 
970
966
 }
971
967
 
972
-#define RTS_AT_AUART()	IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(s->gpios,	\
973
-							UART_GPIO_RTS))
974
-#define CTS_AT_AUART()	IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(s->gpios,	\
975
-							UART_GPIO_CTS))
968
+#define RTS_AT_AUART()	!mctrl_gpio_to_gpiod(s->gpios, UART_GPIO_RTS)
969
+#define CTS_AT_AUART()	!mctrl_gpio_to_gpiod(s->gpios, UART_GPIO_CTS)
976
970
 static void mxs_auart_settermios(struct uart_port *u,
977
971
 				 struct ktermios *termios,
978
972
 				 struct ktermios *old)
..
..
@@ -1695,6 +1689,7 @@
1695
1689
 	s->port.fifosize = MXS_AUART_FIFO_SIZE;
1696
1690
 	s->port.uartclk = clk_get_rate(s->clk);
1697
1691
 	s->port.type = PORT_IMX;
1692
+	s->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_MXS_AUART_CONSOLE);
1698
1693
 
1699
1694
 	mxs_init_regs(s);
1700
1695