forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd
kernel/drivers/tty/serial/zs.c
....@@ -44,10 +44,6 @@
4444 * complicated and prevents the use of some automatic modes of operation.
4545 */
4646
47
-#if defined(CONFIG_SERIAL_ZS_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
48
-#define SUPPORT_SYSRQ
49
-#endif
50
-
5147 #include <linux/bug.h>
5248 #include <linux/console.h>
5349 #include <linux/delay.h>
....@@ -992,7 +988,7 @@
992988 static int zs_map_port(struct uart_port *uport)
993989 {
994990 if (!uport->membase)
995
- uport->membase = ioremap_nocache(uport->mapbase,
991
+ uport->membase = ioremap(uport->mapbase,
996992 ZS_CHAN_IO_SIZE);
997993 if (!uport->membase) {
998994 printk(KERN_ERR "zs: Cannot map MMIO\n");
....@@ -1106,6 +1102,7 @@
11061102 zport->scc = &zs_sccs[chip];
11071103 zport->clk_mode = 16;
11081104
1105
+ uport->has_sysrq = IS_ENABLED(CONFIG_SERIAL_ZS_CONSOLE);
11091106 uport->irq = zs_parms.irq[chip];
11101107 uport->uartclk = ZS_CLOCK;
11111108 uport->fifosize = 1;