Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

Pull pin control changes from Linus Walleij:
 "Here is a stash of pin control changes I have collected for the v3.19
  series.  Mainly new hardware support, with Intels new embedded SoC as
  the especially interesting thing standing out, fully using the
  subsystem.

   - Force conversion of the ux500 pin control device trees and parsers
     to use the generic pin control bindings.
   - New driver and device tree bindings for the Qualcomm PMIC MPP pin
     controller and GPIO.
   - Some ACPI infrastructure for pin controllers.
   - New driver for the Intel CherryView/Braswell pin controller, the
     first Intel pin controller to fully take advantage of the pin
     control subsystem.
   - Support the Freescale i.MX VF610 variant.
   - Support the sunxi A80 variant.
   - Support the Samsung Exynos 4415 and Exynos 7 variants.
   - Split out Intel pin controllers to their own subdirectory.
   - A large slew of rockchip pin control updates, including
     suspend/resume support.
   - A large slew of Samsung Exynos pin controller updates.
   - Various minor updates and fixes"

* tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (49 commits)
  pinctrl: at91: enhance (debugfs) at91_gpio_dbg_show
  pinctrl: meson: add device tree bindings documentation
  gpio: tz1090: Fix error handling of irq_of_parse_and_map
  pinctrl: tz1090-pinctrl.txt: Fix typo in binding
  pinctrl: pinconf-generic: Declare dt_params/conf_items const
  pinctrl: exynos: Add support for Exynos4415
  pinctrl: exynos: Add initial driver data for Exynos7
  pinctrl: exynos: Add irq_chip instance for Exynos7 wakeup interrupts
  pinctrl: exynos: Consolidate irq domain callbacks
  pinctrl: exynos: Generalize the eint16_31 demux code
  pinctrl: samsung: Separate per-bank init and runtime data
  pinctrl: samsung: Constify samsung_pin_ctrl struct
  pinctrl: samsung: Constify samsung_pin_bank_type struct
  pinctrl: samsung: Drop unused label field in samsung_pin_ctrl struct
  pinctrl: samsung: Make samsung_pinctrl_get_soc_data use ERR_PTR()
  pinctrl: Add Intel Cherryview/Braswell pin controller support
  gpio / ACPI: Add knowledge about pin controllers to acpi_get_gpiod()
  pinctrl: Fix path error in documentation
  pinctrl: rockchip: save and restore gpio6_c6 pinmux in suspend/resume
  pinctrl: rockchip: add suspend/resume functions
  ...

diff --cc Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/ste-nomadik-s8815.dts
index e411ff7769fee3fb2481bd89a0d7585d4eb1703e,cc81ae7450a99e89620a4b507a4508510e3e4efe..85d3b95dfdba55b543aa0f66733df936d5074abc
--- 1/arch/arm/boot/dts/ste-nomadik-s8815.dts
--- 2/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@@ -40,14 -47,6 +40,14 @@@
                                };
                        };
                };
-                                       ste,pins = "GPIO73_C21", "GPIO74_C20";
 +              gpioi2c {
 +                      gpioi2c_default_mode: gpioi2c_default {
 +                              gpioi2c_default_cfg {
++                                      pins = "GPIO73_C21", "GPIO74_C20";
 +                                      ste,input = <0>;
 +                              };
 +                      };
 +              };
                user-led {
                        user_led_default_mode: user_led_default {
                                user_led_default_cfg {

diff --cc arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index f435ff20aefef7d1b7edbd7391217ac140a585de,c8b4a93180f8c6a24e5c89065bccf8bdefef3637..f182f6538e902e567602e5e3195d562b572b538f
--- 1/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
--- 2/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@@ -116,8 -116,8 +116,8 @@@
                mmcsd {
                        mmcsd_default_mux: mmcsd_mux {
                                mmcsd_default_mux {
-                                       ste,function = "mmcsd";
-                                       ste,pins = "mmcsd_a_1", "mmcsd_b_1";
+                                       function = "mmcsd";
 -                                      groups = "mmcsd_a_1";
++                                      groups = "mmcsd_a_1", "mmcsd_b_1";
                                };
                        };
                        mmcsd_default_mode: mmcsd_default {
@@@ -127,9 -127,9 +127,9 @@@
                                        ste,output = <0>;
                                };
                                mmcsd_default_cfg2 {
 -                                      /* MCCMDDIR, MCDAT0DIR, MCDAT31DIR */
 +                                      /* MCCMDDIR, MCDAT0DIR, MCDAT31DIR, MCDATDIR2 */
-                                       ste,pins = "GPIO10_C11", "GPIO15_A12",
+                                       pins = "GPIO10_C11", "GPIO15_A12",
 -                                      "GPIO16_C13";
 +                                      "GPIO16_C13", "GPIO23_D15";
                                        ste,output = <1>;
                                };
                                mmcsd_default_cfg3 {

diff --cc drivers/gpio/gpiolib-acpi.c
Simple merge

diff --cc drivers/pinctrl/intel/pinctrl-baytrail.c
Simple merge