forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd
kernel/drivers/tty/serial/mux.c
....@@ -25,11 +25,7 @@
2525 #include <asm/irq.h>
2626 #include <asm/parisc-device.h>
2727
28
-#if defined(CONFIG_SERIAL_MUX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
2928 #include <linux/sysrq.h>
30
-#define SUPPORT_SYSRQ
31
-#endif
32
-
3329 #include <linux/serial_core.h>
3430
3531 #define MUX_OFFSET 0x800
....@@ -474,7 +470,7 @@
474470 port->iobase = 0;
475471 port->mapbase = dev->hpa.start + MUX_OFFSET +
476472 (i * MUX_LINE_OFFSET);
477
- port->membase = ioremap_nocache(port->mapbase, MUX_LINE_OFFSET);
473
+ port->membase = ioremap(port->mapbase, MUX_LINE_OFFSET);
478474 port->iotype = UPIO_MEM;
479475 port->type = PORT_MUX;
480476 port->irq = 0;
....@@ -483,6 +479,7 @@
483479 port->ops = &mux_pops;
484480 port->flags = UPF_BOOT_AUTOCONF;
485481 port->line = port_cnt;
482
+ port->has_sysrq = IS_ENABLED(CONFIG_SERIAL_MUX_CONSOLE);
486483
487484 /* The port->timeout needs to match what is present in
488485 * uart_wait_until_sent in serial_core.c. Otherwise