diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-06-17 11:03:14 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-06-17 11:03:14 (GMT) |
| commit | 1e383d7bdd988b1453a3a86f5e14b012700f7dff (patch) | |
| tree | f64eb17440141028d3e6312a40f7eb63d100ddcb /arch/arm/mach-omap2/serial.c | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
| parent | 4b7ec5accecdb136c7afaf8739a06d5335cc05aa (diff) | |
| download | linux-fsl-qoriq-1e383d7bdd988b1453a3a86f5e14b012700f7dff.tar.xz | |
Merge tag 'omap-pm-v3.11/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm-serial
OMAP: PM: the serial core + driver can no handle no_console_suspend support
without any SoC specific handlding or SoC-specific DT bindings. Remove
the now unused SoC specifics for OMAP.
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 8396b5b..25fb6e9 100644 --- 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 u8 no_console_suspend; static u8 uart_debug; #define DEFAULT_RXDMA_POLLRATE 1 /* RX DMA polling rate (us) */ @@ -236,9 +235,6 @@ static int __init omap_serial_early_init(void) 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 @@ -323,9 +319,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, 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) { |