projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
mach-omap2
/
serial.c
diff --git
a/arch/arm/mach-omap2/serial.c
b/arch/arm/mach-omap2/serial.c
index a7cf8d783bd00a7c1560e19294fc338583d17c19..3a674de6cb632d21dade993c9e0cb3ca2c7babd8 100644
(file)
--- a/
arch/arm/mach-omap2/serial.c
+++ b/
arch/arm/mach-omap2/serial.c
@@
-63,7
+63,6
@@
struct omap_uart_state {
static LIST_HEAD(uart_list);
static u8 num_uarts;
static u8 console_uart_id = -1;
static LIST_HEAD(uart_list);
static u8 num_uarts;
static u8 console_uart_id = -1;
-static u8 no_console_suspend;
static u8 uart_debug;
#define DEFAULT_RXDMA_POLLRATE 1 /* RX DMA polling rate (us) */
static u8 uart_debug;
#define DEFAULT_RXDMA_POLLRATE 1 /* RX DMA polling rate (us) */
@@
-210,9
+209,6
@@
static int __init omap_serial_early_init(void)
uart_name, uart->num);
}
uart_name, uart->num);
}
- if (cmdline_find_option("no_console_suspend"))
- no_console_suspend = true;
-
/*
* omap-uart can be used for earlyprintk logs
* So if omap-uart is used as console then prevent
/*
* omap-uart can be used for earlyprintk logs
* So if omap-uart is used as console then prevent
@@
-295,9
+291,6
@@
void __init omap_serial_init_port(struct omap_board_data *bdata,
return;
}
return;
}
- if ((console_uart_id == bdata->id) && no_console_suspend)
- omap_device_disable_idle_on_suspend(pdev);
-
oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
if (console_uart_id == bdata->id) {
oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
if (console_uart_id == bdata->id) {