Merge tag 'renesas-dt-fixes2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel...

Second Round of Renesas ARM Based SoC DT Fixes for v3.14

Correct i2c clock references for r8a7790 (R-Car H2) SoC

The error was introduced in 72197ca7a1cb1cea5 ("ARM: shmobile: r8a7790:
Reference clocks") which is queued up for v3.14.

* tag 'renesas-dt-fixes2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790.dtsi: ficx i2c[0-3] clock reference

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/boot/dts/r8a7790.dtsi
index f48487c2a970aa6020d7400dfa3fbc2c710855cc,46ac214e1c0a2b9b7d09a27ed94ff19be473b500..71b1251f79c73d24a4607aa33bbcc4b6fbafb0d0
--- 1/arch/arm/boot/dts/r8a7790.dtsi
--- 2/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@@ -91,9 -91,9 +91,9 @@@
                interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
        };
  
 -      gpio0: gpio@ffc40000 {
 +      gpio0: gpio@e6050000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc40000 0 0x2c>;
 +              reg = <0 0xe6050000 0 0x50>;
                interrupt-parent = <&gic>;
                interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
@@@ -103,9 -103,9 +103,9 @@@
                interrupt-controller;
        };
  
 -      gpio1: gpio@ffc41000 {
 +      gpio1: gpio@e6051000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc41000 0 0x2c>;
 +              reg = <0 0xe6051000 0 0x50>;
                interrupt-parent = <&gic>;
                interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
@@@ -115,9 -115,9 +115,9 @@@
                interrupt-controller;
        };
  
 -      gpio2: gpio@ffc42000 {
 +      gpio2: gpio@e6052000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc42000 0 0x2c>;
 +              reg = <0 0xe6052000 0 0x50>;
                interrupt-parent = <&gic>;
                interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
@@@ -127,9 -127,9 +127,9 @@@
                interrupt-controller;
        };
  
 -      gpio3: gpio@ffc43000 {
 +      gpio3: gpio@e6053000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc43000 0 0x2c>;
 +              reg = <0 0xe6053000 0 0x50>;
                interrupt-parent = <&gic>;
                interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
@@@ -139,9 -139,9 +139,9 @@@
                interrupt-controller;
        };
  
 -      gpio4: gpio@ffc44000 {
 +      gpio4: gpio@e6054000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc44000 0 0x2c>;
 +              reg = <0 0xe6054000 0 0x50>;
                interrupt-parent = <&gic>;
                interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
@@@ -151,9 -151,9 +151,9 @@@
                interrupt-controller;
        };
  
 -      gpio5: gpio@ffc45000 {
 +      gpio5: gpio@e6055000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 -              reg = <0 0xffc45000 0 0x2c>;
 +              reg = <0 0xe6055000 0 0x50>;
                interrupt-parent = <&gic>;
                interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
@@@ -197,7 -197,7 +197,7 @@@
                reg = <0 0xe6508000 0 0x40>;
                interrupt-parent = <&gic>;
                interrupts = <0 287 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp3_clks R8A7790_CLK_I2C0>;
+               clocks = <&mstp9_clks R8A7790_CLK_I2C0>;
                status = "disabled";
        };
  
@@@ -208,7 -208,7 +208,7 @@@
                reg = <0 0xe6518000 0 0x40>;
                interrupt-parent = <&gic>;
                interrupts = <0 288 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp3_clks R8A7790_CLK_I2C1>;
+               clocks = <&mstp9_clks R8A7790_CLK_I2C1>;
                status = "disabled";
        };
  
@@@ -219,7 -219,7 +219,7 @@@
                reg = <0 0xe6530000 0 0x40>;
                interrupt-parent = <&gic>;
                interrupts = <0 286 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp3_clks R8A7790_CLK_I2C2>;
+               clocks = <&mstp9_clks R8A7790_CLK_I2C2>;
                status = "disabled";
        };
  
@@@ -230,7 -230,7 +230,7 @@@
                reg = <0 0xe6540000 0 0x40>;
                interrupt-parent = <&gic>;
                interrupts = <0 290 IRQ_TYPE_LEVEL_HIGH>;
-               clocks = <&mstp3_clks R8A7790_CLK_I2C3>;
+               clocks = <&mstp9_clks R8A7790_CLK_I2C3>;
                status = "disabled";
        };
  
@@@ -261,7 -261,7 +261,7 @@@
  
        sdhi0: sd@ee100000 {
                compatible = "renesas,sdhi-r8a7790";
 -              reg = <0 0xee100000 0 0x100>;
 +              reg = <0 0xee100000 0 0x200>;
                interrupt-parent = <&gic>;
                interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
@@@ -271,7 -271,7 +271,7 @@@
  
        sdhi1: sd@ee120000 {
                compatible = "renesas,sdhi-r8a7790";
 -              reg = <0 0xee120000 0 0x100>;
 +              reg = <0 0xee120000 0 0x200>;
                interrupt-parent = <&gic>;
                interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
                clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;