]> Pileus Git - ~andy/linux/commitdiff
Merge tag 'renesas-dt-fixes2-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Fri, 31 Jan 2014 23:08:10 +0000 (15:08 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 31 Jan 2014 23:08:10 +0000 (15:08 -0800)
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>
arch/arm/boot/dts/r8a7790.dtsi

index f48487c2a970aa6020d7400dfa3fbc2c710855cc..71b1251f79c73d24a4607aa33bbcc4b6fbafb0d0 100644 (file)
                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";
        };
 
                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";
        };
 
                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";
        };
 
                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";
        };