Merge tag 'omap-for-v3.11/pm-serial-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren:

Serial driver platform init code clean-up via Kevin Hilman <khilman@linaro.org>:

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.

* tag 'omap-for-v3.11/pm-serial-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  arm: omap2+: omap_device: remove no_idle_on_suspend
  arm: dts: am33xx: Remove "ti,no_idle_on_suspend" property.
  arm: omap2+: serial: remove no_console_suspend support

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 0 insertions, 7 deletions

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index f6601563aa69..58d5b5667315 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) */
@@ -207,9 +206,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
@@ -292,9 +288,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) {