diff options
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 5 | ||||
| -rw-r--r-- | drivers/serial/s3c2410.c | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c index ab314b405c7..2d4fd617376 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c @@ -30,6 +30,9 @@ #include <asm/arch/regs-gpioj.h> #endif +extern void s3c24xx_serial_console_set_silence(int silence); +extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency * + resume_dependency, int uart_index); int gta_gsm_interrupts; EXPORT_SYMBOL(gta_gsm_interrupts); @@ -100,6 +103,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr, "disconnecting serial console\n"); console_stop(gta01_gsm.con); + s3c24xx_serial_console_set_silence(1); } if (gta01_gsm.gpio_ngsm_en) @@ -139,6 +143,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr, s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 1); if (gta01_gsm.con) { + s3c24xx_serial_console_set_silence(0); console_start(gta01_gsm.con); dev_dbg(dev, "powered down GSM, thus enabling " diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index fef212c86d9..80c901c61c2 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c @@ -1716,6 +1716,13 @@ module_exit(s3c24xx_serial_modexit); #ifdef CONFIG_SERIAL_S3C2410_CONSOLE static struct uart_port *cons_uart; +static int cons_silenced; + +void s3c24xx_serial_console_set_silence(int silenced) +{ + cons_silenced = silenced; +} +EXPORT_SYMBOL(s3c24xx_serial_console_set_silence); static int s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon) @@ -1742,6 +1749,9 @@ s3c24xx_serial_console_putchar(struct uart_port *port, int ch) unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON); unsigned int umcon = rd_regl(cons_uart, S3C2410_UMCON); + if (cons_silenced) + return; + /* If auto HW flow control enabled, temporarily turn it off */ if (umcon & S3C2410_UMCOM_AFC) wr_regl(port, S3C2410_UMCON, (umcon & !S3C2410_UMCOM_AFC)); |