Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a00928f5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt-fixes2-for-v3.14' of... 

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

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 72197ca7 ("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: default avatarOlof Johansson <olof@lixom.net>
parents c2292c28 2450badf

arch/arm/boot/dts/r8a7790.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -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 @@ 
		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 @@ 
		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 @@ 
		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";

	};