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

Commit 60f91268 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

 into next/soc

Pull "Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18" from Simon Horman:

* kzm9g-reference: Enable CMT1 in device tree
* Use SoC-specific timer compat strings

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

* tag 'renesas-dt-timers2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree
  ARM: shmobile: sh73a0: Add CMT1 device to DT
  ARM: shmobile: r8a7740: Use SoC-specific 48-bit CMT compat string
  ARM: shmobile: r8a7779: Use SoC-specific TMU compat string
  ARM: shmobile: r8a7791: Use SoC-specific 48-bit CMT compat string
  ARM: shmobile: r7s72100: Use SoC-specific MTU2 compat string
  ARM: shmobile: r8a7790: Use SoC-specific 48-bit CMT compat string
parents 138310e1 48a0d1e0

arch/arm/boot/dts/r7s72100.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ 
	};



	mtu2: timer@fcff0000 {

		compatible = "renesas,mtu2";

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

		reg = <0xfcff0000 0x400>;

		interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "tgi0a";

arch/arm/boot/dts/r8a7740.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
	};



	cmt1: timer@e6138000 {

		compatible = "renesas,cmt-48";

		compatible = "renesas,cmt-48-r8a7740", "renesas,cmt-48";

		reg = <0xe6138000 0x170>;

		interrupts = <0 58 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp3_clks R8A7740_CLK_CMT1>;

arch/arm/boot/dts/r8a7779.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ 
	};



	tmu0: timer@ffd80000 {

		compatible = "renesas,tmu";

		compatible = "renesas,tmu-r8a7779", "renesas,tmu";

		reg = <0xffd80000 0x30>;

		interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,

			     <0 33 IRQ_TYPE_LEVEL_HIGH>,
@@ -281,7 +281,7 @@ 
	};



	tmu1: timer@ffd81000 {

		compatible = "renesas,tmu";

		compatible = "renesas,tmu-r8a7779", "renesas,tmu";

		reg = <0xffd81000 0x30>;

		interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>,

			     <0 37 IRQ_TYPE_LEVEL_HIGH>,
@@ -295,7 +295,7 @@ 
	};



	tmu2: timer@ffd82000 {

		compatible = "renesas,tmu";

		compatible = "renesas,tmu-r8a7779", "renesas,tmu";

		reg = <0xffd82000 0x30>;

		interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>,

			     <0 41 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/boot/dts/r8a7790.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ 
	};



	cmt0: timer@ffca0000 {

		compatible = "renesas,cmt-48-gen2";

		compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";

		reg = <0 0xffca0000 0 0x1004>;

		interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,

			     <0 143 IRQ_TYPE_LEVEL_HIGH>;
@@ -220,7 +220,7 @@ 
	};



	cmt1: timer@e6130000 {

		compatible = "renesas,cmt-48-gen2";

		compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";

		reg = <0 0xe6130000 0 0x1004>;

		interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,

			     <0 121 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/boot/dts/r8a7791.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ 
	};



	cmt0: timer@ffca0000 {

		compatible = "renesas,cmt-48-gen2";

		compatible = "renesas,cmt-48-r8a7791", "renesas,cmt-48-gen2";

		reg = <0 0xffca0000 0 0x1004>;

		interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,

			     <0 143 IRQ_TYPE_LEVEL_HIGH>;
@@ -203,7 +203,7 @@ 
	};



	cmt1: timer@e6130000 {

		compatible = "renesas,cmt-48-gen2";

		compatible = "renesas,cmt-48-r8a7791", "renesas,cmt-48-gen2";

		reg = <0 0xe6130000 0 0x1004>;

		interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,

			     <0 121 IRQ_TYPE_LEVEL_HIGH>,