Merge branch 'next/soc' into for-next

* next/soc:
  ARM: OMAP2+: Enable CPUidle in omap2plus_defconfig
  ARM: dts: Enable N900 keyboard sleep leds by default
  ARM: OMAP2+: Fix voltage scaling init for device tree
  ARM: dts: Configure omap3 twl4030 I2C4 pins by default
  ARM: OMAP3: Fix voltage control for deeper idle states
  ARM: OMAP3: Disable broken omap3_set_off_timings function
  ARM: OMAP3: Fix idle mode signaling for sys_clkreq and sys_off_mode
  ARM: dts: Fix omap serial wake-up when booted with device tree
  mfd: twl-core: Fix idle mode signaling for omaps when booted with device tree

Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
	arch/arm/boot/dts/omap3-n900.dts
	include/dt-bindings/pinctrl/omap.h

diff --cc arch/arm/boot/dts/omap3-n900.dts
index f9fbb03158081b63050e2c6180513ddc97c2fda8,150ca097c02d704bd2e2659c77fd10ca20549eb1..2a61ec1157ea1be439104eb98b6737aba9069fa9
--- 1/arch/arm/boot/dts/omap3-n900.dts
--- 2/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@@ -144,14 -141,11 +155,19 @@@
                >;
        };
  
 +      mcspi4_pins: pinmux_mcspi4_pins {
 +              pinctrl-single,pins = <
 +                      0x15c (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_clk */
 +                      0x162 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mcspi4_somi */
 +                      0x160 (PIN_OUTPUT | MUX_MODE1) /* mcspi4_simo */
 +                      0x166 (PIN_OUTPUT | MUX_MODE1) /* mcspi4_cs0 */
 +              >;
 +      };
+       debug_leds: pinmux_debug_led_pins {
+               pinctrl-single,pins = <
+                       OMAP3_CORE1_IOPAD(0x2198, PIN_OUTPUT | MUX_MODE4)       /* mcbsp1_clkx.gpio_162 */
+               >;
+       };
  
        mmc1_pins: pinmux_mmc1_pins {
                pinctrl-single,pins = <

diff --cc arch/arm/boot/dts/omap3.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap4.dtsi
Simple merge

diff --cc arch/arm/mach-omap2/vc.c
Simple merge

diff --cc include/dt-bindings/pinctrl/omap.h
index 827e80964a35484d2efd8d7e0f6e68610cde8af7,404ba7ef78131fc6665f60a3d96a13c970ad3a93..1c75b8ca5228a9a47c5d00c81df1b28c0a524f60
--- 1/include/dt-bindings/pinctrl/omap.h
--- 2/include/dt-bindings/pinctrl/omap.h
+++ b/include/dt-bindings/pinctrl/omap.h
@@@ -62,17 -62,24 +62,29 @@@
  #define OMAP3630_CORE2_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x25a0) (val)
  #define OMAP3_WKUP_IOPAD(pa, val)     OMAP_IOPAD_OFFSET((pa), 0x2a00) (val)
  #define AM33XX_IOPAD(pa, val)         OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 -#define OMAP4_CORE_IOPAD(pa, val)     OMAP_IOPAD_OFFSET((pa), 0x0040) (val)
 -#define OMAP4_WKUP_IOPAD(pa, val)     OMAP_IOPAD_OFFSET((pa), 0xe040) (val)
  #define AM4372_IOPAD(pa, val)         OMAP_IOPAD_OFFSET((pa), 0x0800) (val)
 -#define OMAP5_CORE_IOPAD(pa, val)     OMAP_IOPAD_OFFSET((pa), 0x2840) (val)
 -#define OMAP5_WKUP_IOPAD(pa, val)     OMAP_IOPAD_OFFSET((pa), 0xc840) (val)
  #define DRA7XX_CORE_IOPAD(pa, val)    OMAP_IOPAD_OFFSET((pa), 0x3400) (val)
  
 +/*
 + * Macros to allow using the offset from the padconf physical address
 + * instead  of the offset from padconf base.
 + */
 +#define OMAP_PADCONF_OFFSET(offset, base_offset)      ((offset) - (base_offset))
 +
 +#define OMAP4_IOPAD(offset, val)      OMAP_PADCONF_OFFSET((offset), 0x0040) (val)
 +#define OMAP5_IOPAD(offset, val)      OMAP_PADCONF_OFFSET((offset), 0x0040) (val)
 +
+ /*
+  * Define some commonly used pins configured by the boards.
+  * Note that some boards use alternative pins, so check
+  * the schematics before using these.
+  */
+ #define OMAP3_UART1_RX                0x152
+ #define OMAP3_UART2_RX                0x14a
+ #define OMAP3_UART3_RX                0x16e
+ #define OMAP4_UART2_RX                0xdc
+ #define OMAP4_UART3_RX                0x104
+ #define OMAP4_UART4_RX                0x11c
+ 
  #endif