forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920
kernel/drivers/tty/serial/mxs-auart.c
....@@ -12,10 +12,6 @@
1212 * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
1313 */
1414
15
-#if defined(CONFIG_SERIAL_MXS_AUART_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
16
-#define SUPPORT_SYSRQ
17
-#endif
18
-
1915 #include <linux/kernel.h>
2016 #include <linux/errno.h>
2117 #include <linux/init.h>
....@@ -969,10 +965,8 @@
969965
970966 }
971967
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)
976970 static void mxs_auart_settermios(struct uart_port *u,
977971 struct ktermios *termios,
978972 struct ktermios *old)
....@@ -1695,6 +1689,7 @@
16951689 s->port.fifosize = MXS_AUART_FIFO_SIZE;
16961690 s->port.uartclk = clk_get_rate(s->clk);
16971691 s->port.type = PORT_IMX;
1692
+ s->port.has_sysrq = IS_ENABLED(CONFIG_SERIAL_MXS_AUART_CONSOLE);
16981693
16991694 mxs_init_regs(s);
17001695