Merge tag 'renesas-pinmux-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel...

From Simon Horman:
Renesas ARM based SoC pinmux updates for v3.12

SH Mobile pinctrl DT support

* tag 'renesas-pinmux-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9g-reference: Add LED1-LED4 to the device tree
  ARM: shmobile: kzm9g-reference: Move SDHI regulators to DT
  ARM: shmobile: kzm9g-reference: Move pinctrl mappings to device tree
  ARM: shmobile: marzen-reference: Add LED2-LED4 to the device tree
  ARM: shmobile: marzen-reference: Move pinctrl mappings to device tree
  ARM: shmobile: armadillo-reference: Add LED1-LED4 to the device tree
  ARM: shmobile: armadillo-reference: Move st1232 reset GPIO to DT
  ARM: shmobile: armadillo-reference: Add st1232 pin mappings
  ARM: shmobile: armadillo-reference: Move pinctrl mappings to device tree
  ARM: shmobile: sh73a0: Add pin control device to device tree
  ARM: shmobile: sh7372: Add pin control device to device tree
  ARM: shmobile: r8a7790: Add GPIO controller devices to device tree
  ARM: shmobile: r8a7790: Add pin control device to device tree
  ARM: shmobile: r8a7779: Add GPIO controller devices to device tree
  ARM: shmobile: r8a7779: Add pin control device to device tree
  ARM: shmobile: r8a7778: Add GPIO controller devices to device tree
  ARM: shmobile: r8a7778: Add pin control device to device tree
  ARM: shmobile: r8a7740: Add pin control device to device tree
  ARM: shmobile: r8a73a4: Add pin control device to device tree

Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
	arch/arm/boot/dts/r8a73a4.dtsi
	arch/arm/boot/dts/r8a7790.dtsi

diff --cc arch/arm/boot/dts/r8a73a4.dtsi
index 6ce699be6095eb28f4fd65932467b0122d25e0eb,b886afda0c2334efee3e1c72e2860aa2622e17cc..6c26caa880f2917344ada23a6a8e8e106412a0f9
--- 1/arch/arm/boot/dts/r8a73a4.dtsi
--- 2/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@@ -86,129 -86,10 +86,136 @@@
                interrupts = <0 69 4>;
        };
  
 +      i2c0: i2c@e6500000 {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              compatible = "renesas,rmobile-iic";
 +              reg = <0 0xe6500000 0 0x428>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 174 0x4>;
 +      };
 +
 +      i2c1: i2c@e6510000 {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              compatible = "renesas,rmobile-iic";
 +              reg = <0 0xe6510000 0 0x428>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 175 0x4>;
 +      };
 +
 +      i2c2: i2c@e6520000 {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              compatible = "renesas,rmobile-iic";
 +              reg = <0 0xe6520000 0 0x428>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 176 0x4>;
 +      };
 +
 +      i2c3: i2c@e6530000 {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              compatible = "renesas,rmobile-iic";
 +              reg = <0 0xe6530000 0 0x428>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 177 0x4>;
 +      };
 +
 +      i2c4: i2c@e6540000 {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              compatible = "renesas,rmobile-iic";
 +              reg = <0 0xe6540000 0 0x428>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 178 0x4>;
 +      };
 +
 +      i2c5: i2c@e60b0000 {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              compatible = "renesas,rmobile-iic";
 +              reg = <0 0xe60b0000 0 0x428>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 179 0x4>;
 +      };
 +
 +      i2c6: i2c@e6550000 {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              compatible = "renesas,rmobile-iic";
 +              reg = <0 0xe6550000 0 0x428>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 184 0x4>;
 +      };
 +
 +      i2c7: i2c@e6560000 {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              compatible = "renesas,rmobile-iic";
 +              reg = <0 0xe6560000 0 0x428>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 185 0x4>;
 +      };
 +
 +      i2c8: i2c@e6570000 {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              compatible = "renesas,rmobile-iic";
 +              reg = <0 0xe6570000 0 0x428>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 173 0x4>;
 +      };
 +
 +      mmcif0: mmcif@ee200000 {
 +              compatible = "renesas,sh-mmcif";
 +              reg = <0 0xee200000 0 0x80>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 169 0x4>;
 +              reg-io-width = <4>;
 +              status = "disabled";
 +      };
 +
 +      mmcif1: mmcif@ee220000 {
 +              compatible = "renesas,sh-mmcif";
 +              reg = <0 0xee220000 0 0x80>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 170 0x4>;
 +              reg-io-width = <4>;
 +              status = "disabled";
 +      };
 +
+       pfc: pfc@e6050000 {
+               compatible = "renesas,pfc-r8a73a4";
+               reg = <0 0xe6050000 0 0x9000>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
++
 +      sdhi0: sdhi@ee100000 {
 +              compatible = "renesas,r8a73a4-sdhi";
 +              reg = <0 0xee100000 0 0x100>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 165 4>;
 +              cap-sd-highspeed;
 +              status = "disabled";
 +      };
 +
 +      sdhi1: sdhi@ee120000 {
 +              compatible = "renesas,r8a73a4-sdhi";
 +              reg = <0 0xee120000 0 0x100>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 166 4>;
 +              cap-sd-highspeed;
 +              status = "disabled";
 +      };
 +
 +      sdhi2: sdhi@ee140000 {
 +              compatible = "renesas,r8a73a4-sdhi";
 +              reg = <0 0xee140000 0 0x100>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 167 4>;
 +              cap-sd-highspeed;
 +              status = "disabled";
 +      };
  };

diff --cc arch/arm/boot/dts/r8a7790.dtsi
index 9cd88202809547a6974f6f38a7ae84c784e136bf,9465cfcdaab7434ed89aee1a57a5f5111a57da09..3b879e7c697c336748d5f35adf6744c6d7e14458
--- 1/arch/arm/boot/dts/r8a7790.dtsi
--- 2/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@@ -55,57 -127,9 +127,63 @@@
                interrupts = <0 0 4>, <0 1 4>, <0 2 4>, <0 3 4>;
        };
  
 +      mmcif0: mmcif@ee200000 {
 +              compatible = "renesas,sh-mmcif";
 +              reg = <0 0xee200000 0 0x80>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 169 0x4>;
 +              reg-io-width = <4>;
 +              status = "disabled";
 +      };
 +
 +      mmcif1: mmcif@ee220000 {
 +              compatible = "renesas,sh-mmcif";
 +              reg = <0 0xee220000 0 0x80>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 170 0x4>;
 +              reg-io-width = <4>;
 +              status = "disabled";
 +      };
 +
+       pfc: pfc@e6060000 {
+               compatible = "renesas,pfc-r8a7790";
+               reg = <0 0xe6060000 0 0x250>;
+               #gpio-range-cells = <3>;
+       };
++
 +      sdhi0: sdhi@ee100000 {
 +              compatible = "renesas,r8a7790-sdhi";
 +              reg = <0 0xee100000 0 0x100>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 165 4>;
 +              cap-sd-highspeed;
 +              status = "disabled";
 +      };
 +
 +      sdhi1: sdhi@ee120000 {
 +              compatible = "renesas,r8a7790-sdhi";
 +              reg = <0 0xee120000 0 0x100>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 166 4>;
 +              cap-sd-highspeed;
 +              status = "disabled";
 +      };
 +
 +      sdhi2: sdhi@ee140000 {
 +              compatible = "renesas,r8a7790-sdhi";
 +              reg = <0 0xee140000 0 0x100>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 167 4>;
 +              cap-sd-highspeed;
 +              status = "disabled";
 +      };
 +
 +      sdhi3: sdhi@ee160000 {
 +              compatible = "renesas,r8a7790-sdhi";
 +              reg = <0 0xee160000 0 0x100>;
 +              interrupt-parent = <&gic>;
 +              interrupts = <0 168 4>;
 +              cap-sd-highspeed;
 +              status = "disabled";
 +      };
  };

diff --cc arch/arm/mach-shmobile/board-kzm9g-reference.c
index 41092bb01ee541e55198955b0452529231f790f3,1847b4df0eb77f9a5ade259796a39f24d58c62b0..a66a808db01269495317c4d41ac3172a4d3763ff
--- 1/arch/arm/mach-shmobile/board-kzm9g-reference.c
--- 2/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@@ -21,13 -21,11 +21,10 @@@
   */
  
  #include <linux/delay.h>
- #include <linux/gpio.h>
  #include <linux/io.h>
  #include <linux/irq.h>
 -#include <linux/irqchip.h>
  #include <linux/input.h>
  #include <linux/of_platform.h>
- #include <linux/pinctrl/machine.h>
- #include <linux/pinctrl/pinconf-generic.h>
  #include <mach/sh73a0.h>
  #include <mach/common.h>
  #include <asm/hardware/cache-l2x0.h>