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

Commit 09d12ad7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-dt-timers-for-v3.18' of... 

Merge tag 'renesas-dt-timers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

 into next/soc

Merge "Renesas ARM Based SoC DT Timers Updates for v3.18" from Simon Horman:

* Enable timers using DT when booting boards without Legacy-C code

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'renesas-dt-timers-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: genmai-reference: Enable MTU2 in device tree
  ARM: shmobile: r7s72100: Add MTU2 device to DT
  ARM: shmobile: marzen-reference: Enable TMU0 in device tree
  ARM: shmobile: koelsch-reference: Enable CMT0 in device tree
  ARM: shmobile: lager-reference: Enable CMT0 in device tree
  ARM: shmobile: r8a7779: Add TMU devices to DT
  ARM: shmobile: r8a7791: Add CMT devices to DT
  ARM: shmobile: r8a7790: Add CMT devices to DT

Conflicts:
	arch/arm/mach-shmobile/setup-r8a7779.c
parents e0ace5fc 9dddfcfa

arch/arm/boot/dts/r7s72100-genmai.dts

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ 
	clock-frequency = <48000000>;

};



&mtu2 {

	status = "ok";

};



&i2c2 {

	status = "okay";

	clock-frequency = <400000>;

arch/arm/boot/dts/r7s72100.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -229,6 +229,16 @@ 
		status = "disabled";

	};



	mtu2: timer@fcff0000 {

		compatible = "renesas,mtu2";

		reg = <0xfcff0000 0x400>;

		interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "tgi0a";

		clocks = <&mstp3_clks R7S72100_CLK_MTU2>;

		clock-names = "fck";

		status = "disabled";

	};



	scif0: serial@e8007000 {

		compatible = "renesas,scif-r7s72100", "renesas,scif";

		reg = <0xe8007000 64>;

arch/arm/boot/dts/r8a7779-marzen.dts

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ 
	clock-frequency = <31250000>;

};



&tmu0 {

	status = "okay";

};



&pfc {

	lan0_pins: lan0 {

		intc {

arch/arm/boot/dts/r8a7779.dtsi

+42 −0
Original line number Diff line number Diff line
@@ -266,6 +266,48 @@ 
		reg = <0xffc48000 0x38>;

	};



	tmu0: timer@ffd80000 {

		compatible = "renesas,tmu";

		reg = <0xffd80000 0x30>;

		interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,

			     <0 33 IRQ_TYPE_LEVEL_HIGH>,

			     <0 34 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7779_CLK_TMU0>;

		clock-names = "fck";



		#renesas,channels = <3>;



		status = "disabled";

	};



	tmu1: timer@ffd81000 {

		compatible = "renesas,tmu";

		reg = <0xffd81000 0x30>;

		interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>,

			     <0 37 IRQ_TYPE_LEVEL_HIGH>,

			     <0 38 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7779_CLK_TMU1>;

		clock-names = "fck";



		#renesas,channels = <3>;



		status = "disabled";

	};



	tmu2: timer@ffd82000 {

		compatible = "renesas,tmu";

		reg = <0xffd82000 0x30>;

		interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>,

			     <0 41 IRQ_TYPE_LEVEL_HIGH>,

			     <0 42 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7779_CLK_TMU2>;

		clock-names = "fck";



		#renesas,channels = <3>;



		status = "disabled";

	};



	sata: sata@fc600000 {

		compatible = "renesas,rcar-sata";

		reg = <0xfc600000 0x2000>;

arch/arm/boot/dts/r8a7790-lager.dts

+4 −0
Original line number Diff line number Diff line
@@ -252,6 +252,10 @@ 
	};

};



&cmt0 {

	status = "ok";

};



&mmcif1 {

	pinctrl-0 = <&mmc1_pins>;

	pinctrl-names = "default";