Merge tag 'renesas-gpio-rcar-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel...

From Simon Horman:
Renesas ARM based SoC GPIO R-Car updates for v3.11

DT support to GPIO R-Car driver by Laurent Pinchart.

* tag 'renesas-gpio-rcar-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (131 commits)
  gpio-rcar: Add DT support

diff --combined arch/arm/Kconfig
index 0574901dd74438032e478e56e9b7d49dc509d521,dfb4fee1f552f8fdc5fcf5ad32826b915dbb506d..4dff801c22eba3a91b8ea1affaa15d6a8b4b6049
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -645,7 -645,7 +645,7 @@@ config ARCH_SHMOBIL
        select MULTI_IRQ_HANDLER
        select NEED_MACH_MEMORY_H
        select NO_IOPORT
-       select PINCTRL if ARCH_WANT_OPTIONAL_GPIOLIB
+       select PINCTRL
        select PM_GENERIC_DOMAINS if PM
        select SPARSE_IRQ
        help
@@@ -2054,6 -2054,53 +2054,6 @@@ menu "CPU Power Management
  
  if ARCH_HAS_CPUFREQ
  source "drivers/cpufreq/Kconfig"
 -
 -config CPU_FREQ_S3C
 -      bool
 -      help
 -        Internal configuration node for common cpufreq on Samsung SoC
 -
 -config CPU_FREQ_S3C24XX
 -      bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"
 -      depends on ARCH_S3C24XX && CPU_FREQ
 -      select CPU_FREQ_S3C
 -      help
 -        This enables the CPUfreq driver for the Samsung S3C24XX family
 -        of CPUs.
 -
 -        For details, take a look at <file:Documentation/cpu-freq>.
 -
 -        If in doubt, say N.
 -
 -config CPU_FREQ_S3C24XX_PLL
 -      bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
 -      depends on CPU_FREQ_S3C24XX
 -      help
 -        Compile in support for changing the PLL frequency from the
 -        S3C24XX series CPUfreq driver. The PLL takes time to settle
 -        after a frequency change, so by default it is not enabled.
 -
 -        This also means that the PLL tables for the selected CPU(s) will
 -        be built which may increase the size of the kernel image.
 -
 -config CPU_FREQ_S3C24XX_DEBUG
 -      bool "Debug CPUfreq Samsung driver core"
 -      depends on CPU_FREQ_S3C24XX
 -      help
 -        Enable s3c_freq_dbg for the Samsung S3C CPUfreq core
 -
 -config CPU_FREQ_S3C24XX_IODEBUG
 -      bool "Debug CPUfreq Samsung driver IO timing"
 -      depends on CPU_FREQ_S3C24XX
 -      help
 -        Enable s3c_freq_iodbg for the Samsung S3C CPUfreq core
 -
 -config CPU_FREQ_S3C24XX_DEBUGFS
 -      bool "Export debugfs for CPUFreq"
 -      depends on CPU_FREQ_S3C24XX && DEBUG_FS
 -      help
 -        Export status information via debugfs.
 -
  endif
  
  source "drivers/cpuidle/Kconfig"

diff --combined arch/arm/mach-shmobile/board-marzen.c
index b9594e911ce7680d28448fa50cf854ceb91b33bf,fac9e0f87897cf26f47754f88aa5f10abf137560..9112faef923bb9a22f69a08621ede9f3f5601cae
--- 1/arch/arm/mach-shmobile/board-marzen.c
--- 2/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@@ -28,6 -28,7 +28,7 @@@
  #include <linux/leds.h>
  #include <linux/dma-mapping.h>
  #include <linux/pinctrl/machine.h>
+ #include <linux/platform_data/gpio-rcar.h>
  #include <linux/regulator/fixed.h>
  #include <linux/regulator/machine.h>
  #include <linux/smsc911x.h>
@@@ -173,15 -174,15 +174,15 @@@ static struct platform_device usb_phy_d
  static struct gpio_led marzen_leds[] = {
        {
                .name           = "led2",
-               .gpio           = 157,
+               .gpio           = RCAR_GP_PIN(4, 29),
                .default_state  = LEDS_GPIO_DEFSTATE_ON,
        }, {
                .name           = "led3",
-               .gpio           = 158,
+               .gpio           = RCAR_GP_PIN(4, 30),
                .default_state  = LEDS_GPIO_DEFSTATE_ON,
        }, {
                .name           = "led4",
-               .gpio           = 159,
+               .gpio           = RCAR_GP_PIN(4, 31),
                .default_state  = LEDS_GPIO_DEFSTATE_ON,
        },
  };
@@@ -212,8 -213,8 +213,8 @@@ static struct platform_device *marzen_d
  static struct usb_phy *phy;
  static int usb_power_on(struct platform_device *pdev)
  {
 -      if (!phy)
 -              return -EIO;
 +      if (IS_ERR(phy))
 +              return PTR_ERR(phy);
  
        pm_runtime_enable(&pdev->dev);
        pm_runtime_get_sync(&pdev->dev);
@@@ -225,7 -226,7 +226,7 @@@
  
  static void usb_power_off(struct platform_device *pdev)
  {
 -      if (!phy)
 +      if (IS_ERR(phy))
                return;
  
        usb_phy_shutdown(phy);