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

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>

diff --combined arch/arm/boot/dts/am33xx.dtsi
index 8e1248f01fab0638e3872cef25371b1a660872ea,a2608c02bbd9d4a58d2c9da9e9c791149ba011dc..77aa1b0cf6a74f474704d032a388c8543cffc7d7
--- 1/arch/arm/boot/dts/am33xx.dtsi
--- 2/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -394,7 -394,6 +394,6 @@@
                        compatible = "ti,am3352-ocmcram";
                        reg = <0x40300000 0x10000>;
                        ti,hwmods = "ocmcram";
-                       ti,no_idle_on_suspend;
                };
  
                wkup_m3: wkup_m3@44d00000 {
@@@ -409,8 -408,8 +408,8 @@@
                        ti,hwmods = "gpmc";
                        reg = <0x50000000 0x2000>;
                        interrupts = <100>;
 -                      num-cs = <7>;
 -                      num-waitpins = <2>;
 +                      gpmc,num-cs = <7>;
 +                      gpmc,num-waitpins = <2>;
                        #address-cells = <2>;
                        #size-cells = <1>;
                        status = "disabled";

diff --combined arch/arm/mach-omap2/serial.c
index f6601563aa6903f93e04f9656a58593907f89b0e,25fb6e9fda5c3089ac5503e25bb52fbacff8a0b3..58d5b566731538df4259fc6fbefc655dc6a58d11
--- 1/arch/arm/mach-omap2/serial.c
--- 2/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@@ -63,7 -63,6 +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) */
@@@ -95,9 -94,38 +94,9 @@@ static void omap_uart_enable_wakeup(str
                omap_hwmod_disable_wakeup(od->hwmods[0]);
  }
  
 -/*
 - * Errata i291: [UART]:Cannot Acknowledge Idle Requests
 - * in Smartidle Mode When Configured for DMA Operations.
 - * WA: configure uart in force idle mode.
 - */
 -static void omap_uart_set_noidle(struct device *dev)
 -{
 -      struct platform_device *pdev = to_platform_device(dev);
 -      struct omap_device *od = to_omap_device(pdev);
 -
 -      omap_hwmod_set_slave_idlemode(od->hwmods[0], HWMOD_IDLEMODE_NO);
 -}
 -
 -static void omap_uart_set_smartidle(struct device *dev)
 -{
 -      struct platform_device *pdev = to_platform_device(dev);
 -      struct omap_device *od = to_omap_device(pdev);
 -      u8 idlemode;
 -
 -      if (od->hwmods[0]->class->sysc->idlemodes & SIDLE_SMART_WKUP)
 -              idlemode = HWMOD_IDLEMODE_SMART_WKUP;
 -      else
 -              idlemode = HWMOD_IDLEMODE_SMART;
 -
 -      omap_hwmod_set_slave_idlemode(od->hwmods[0], idlemode);
 -}
 -
  #else
  static void omap_uart_enable_wakeup(struct device *dev, bool enable)
  {}
 -static void omap_uart_set_noidle(struct device *dev) {}
 -static void omap_uart_set_smartidle(struct device *dev) {}
  #endif /* CONFIG_PM */
  
  #ifdef CONFIG_OMAP_MUX
@@@ -207,9 -235,6 +206,6 @@@ static int __init omap_serial_early_ini
                                        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
@@@ -270,6 -295,8 +266,6 @@@ void __init omap_serial_init_port(struc
        omap_up.uartclk = OMAP24XX_BASE_BAUD * 16;
        omap_up.flags = UPF_BOOT_AUTOCONF;
        omap_up.get_context_loss_count = omap_pm_get_dev_context_loss_count;
 -      omap_up.set_forceidle = omap_uart_set_smartidle;
 -      omap_up.set_noidle = omap_uart_set_noidle;
        omap_up.enable_wakeup = omap_uart_enable_wakeup;
        omap_up.dma_rx_buf_size = info->dma_rx_buf_size;
        omap_up.dma_rx_timeout = info->dma_rx_timeout;
@@@ -292,9 -319,6 +288,6 @@@
                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) {