Merge branch 'samsung/pinctrl' into next/dt2

* samsung/pinctrl:
  pinctrl: exynos: Fix wakeup IRQ domain registration check
  pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data
  pinctrl: exynos: Correct the detection of wakeup-eint node
  pinctrl: exynos: Mark exynos_irq_demux_eint as inline
  pinctrl: exynos: Handle only unmasked wakeup interrupts
  pinctrl: exynos: Fix typos in gpio/wkup _irq_mask
  pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa
  ARM: EXYNOS: Enable pinctrl driver support for EXYNOS4 device tree enabled platform
  ARM: dts: Add pinctrl node entries for SAMSUNG EXYNOS4210 SoC
  ARM: EXYNOS: skip wakeup interrupt setup if pinctrl driver is used
  gpio: exynos4: skip gpiolib registration if pinctrl driver is used
  pinctrl: add exynos4210 specific extensions for samsung pinctrl driver
  pinctrl: add samsung pinctrl and gpiolib driver

diff --combined arch/arm/mach-exynos/Kconfig
index 7ec64c8c9917848f133df6e04f59df0b146ff956,195b50eb1e57106bde01d7aab6b9663506b20423..9abdd5747c22623cfca2907bc7d7b2f172c759a7
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -221,7 -221,6 +221,7 @@@ config MACH_SMDKV31
        select EXYNOS4_SETUP_KEYPAD
        select EXYNOS4_SETUP_SDHCI
        select EXYNOS4_SETUP_USB_PHY
 +      select S3C24XX_PWM
        help
          Machine support for Samsung SMDKV310
  
@@@ -349,7 -348,6 +349,7 @@@ config MACH_ORIGE
        select EXYNOS4_SETUP_FIMD0
        select EXYNOS4_SETUP_SDHCI
        select EXYNOS4_SETUP_USB_PHY
 +      select S3C24XX_PWM
        help
          Machine support for ORIGEN based on Samsung EXYNOS4210
  
@@@ -385,7 -383,6 +385,7 @@@ config MACH_SMDK421
        select EXYNOS4_SETUP_KEYPAD
        select EXYNOS4_SETUP_SDHCI
        select EXYNOS4_SETUP_USB_PHY
 +      select S3C24XX_PWM
        help
          Machine support for Samsung SMDK4212
  
@@@ -408,6 -405,8 +408,8 @@@ config MACH_EXYNOS4_D
        select USE_OF
        select ARM_AMBA
        select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
+       select PINCTRL
+       select PINCTRL_EXYNOS4
        help
          Machine support for Samsung Exynos4 machine with device tree enabled.
          Select this if a fdt blob is available for the Exynos4 SoC based board.