[PATCH 0/3] ARM: shmobile: r8a7740/armadillo800eva dts: Enable TMU0

[PATCH 0/3] ARM: shmobile: r8a7740/armadillo800eva dts: Enable TMU0

[Geert Uytterhoeven]

	Hi all,

It seems the TMU got lost from armadillo800eva-reference at some point
in time, and thus the conversion to DT was forgotten.
This series extends the existing bindings to cover r8a7740, adds the device
nodes on r8a7740, and enables TMU0 on armadillo800eva-multiplatform.

Geert Uytterhoeven (3):
  clocksource: sh_tmu: Document R-Mobile r8a7740 binding
  ARM: shmobile: r8a7740 dtsi: Add TMU0 and TMU1 device nodes
  ARM: shmobile: armadillo800eva dts: Enable TMU0

 .../devicetree/bindings/timer/renesas,tmu.txt      |  3 ++-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |  4 ++++
 arch/arm/boot/dts/r8a7740.dtsi                     | 28 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

-- 
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

[PATCH 1/3] clocksource: sh_tmu: Document R-Mobile r8a7740 binding

[Geert Uytterhoeven]

Compared to the r8a7779, the r8a7740 lacks the input capture register,
which is not used by the driver (the current driver already handles the
r8a7740 in the non-DT case).

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 Documentation/devicetree/bindings/timer/renesas,tmu.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/timer/renesas,tmu.txt b/Documentation/devicetree/bindings/timer/renesas,tmu.txt
index 7db89fb2544411b5..4ae7910af09ffcb4 100644
--- a/Documentation/devicetree/bindings/timer/renesas,tmu.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,tmu.txt
@@ -1,4 +1,4 @@
-* Renesas R-Car Timer Unit (TMU)
+* Renesas R-Mobile/R-Car Timer Unit (TMU)
 
 The TMU is a 32-bit timer/counter with configurable clock inputs and
 programmable compare match.
@@ -9,6 +9,7 @@ are independent. The TMU hardware supports up to three channels.
 Required Properties:
 
   - compatible: must contain one or more of the following:
+    - "renesas,tmu-r8a7740" for the r8a7740 TMU
     - "renesas,tmu-r8a7779" for the r8a7779 TMU
     - "renesas,tmu" for any TMU.
       This is a fallback for the above renesas,tmu-* entries
-- 
1.9.1

[PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add TMU0 and TMU1 device nodes

[Geert Uytterhoeven]

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7740.dtsi | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 559bd39e778bddaf..aec8da89ef9ac766 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -335,6 +335,34 @@
 		status = "disabled";
 	};
 
+	tmu0: timer@fff80000 {
+		compatible = "renesas,tmu-r8a7740", "renesas,tmu";
+		reg = <0xfff80000 0x2c>;
+		interrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 199 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 200 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp1_clks R8A7740_CLK_TMU0>;
+		clock-names = "fck";
+
+		#renesas,channels = <3>;
+
+		status = "disabled";
+	};
+
+	tmu1: timer@fff90000 {
+		compatible = "renesas,tmu-r8a7740", "renesas,tmu";
+		reg = <0xfff90000 0x2c>;
+		interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 171 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 172 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp1_clks R8A7740_CLK_TMU1>;
+		clock-names = "fck";
+
+		#renesas,channels = <3>;
+
+		status = "disabled";
+	};
+
 	clocks {
 		#address-cells = <1>;
 		#size-cells = <1>;
-- 
1.9.1

[PATCH 3/3] ARM: shmobile: armadillo800eva dts: Enable TMU0

[Geert Uytterhoeven]

ch0 will be used for clock events and for periodic clock events,
ch1 will be used as clock source.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index 2703428557fce9fa..98504e0b06c8e2ca 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -299,3 +299,7 @@
 
 	status = "okay";
 };
+
+&tmu0 {
+	status = "okay";
+};
-- 
1.9.1

Re: [PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add TMU0 and TMU1 device nodes

[Laurent Pinchart]

Hi Geert,

Thank you for the patch.

On Wednesday 22 October 2014 11:38:28 Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Simon has posted a very similar patch as "[PATCH v2 19/30] ARM: shmobile: 
r8a7740: Add TMU nodes", you might want to credit him.

Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

> ---
>  arch/arm/boot/dts/r8a7740.dtsi | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
> index 559bd39e778bddaf..aec8da89ef9ac766 100644
> --- a/arch/arm/boot/dts/r8a7740.dtsi
> +++ b/arch/arm/boot/dts/r8a7740.dtsi
> @@ -335,6 +335,34 @@
>  		status = "disabled";
>  	};
> 
> +	tmu0: timer@fff80000 {
> +		compatible = "renesas,tmu-r8a7740", "renesas,tmu";
> +		reg = <0xfff80000 0x2c>;
> +		interrupts = <0 198 IRQ_TYPE_LEVEL_HIGH>,
> +			     <0 199 IRQ_TYPE_LEVEL_HIGH>,
> +			     <0 200 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&mstp1_clks R8A7740_CLK_TMU0>;
> +		clock-names = "fck";
> +
> +		#renesas,channels = <3>;
> +
> +		status = "disabled";
> +	};
> +
> +	tmu1: timer@fff90000 {
> +		compatible = "renesas,tmu-r8a7740", "renesas,tmu";
> +		reg = <0xfff90000 0x2c>;
> +		interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>,
> +			     <0 171 IRQ_TYPE_LEVEL_HIGH>,
> +			     <0 172 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&mstp1_clks R8A7740_CLK_TMU1>;
> +		clock-names = "fck";
> +
> +		#renesas,channels = <3>;
> +
> +		status = "disabled";
> +	};
> +
>  	clocks {
>  		#address-cells = <1>;
>  		#size-cells = <1>;

-- 
Regards,

Laurent Pinchart

Re: [PATCH 3/3] ARM: shmobile: armadillo800eva dts: Enable TMU0

[Laurent Pinchart]

Hi Geert,

Thank you for the patch.

On Wednesday 22 October 2014 11:38:29 Geert Uytterhoeven wrote:
> ch0 will be used for clock events and for periodic clock events,
> ch1 will be used as clock source.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Simon has posted the same change as "[PATCH v2 20/30] ARM: shmobile: 
armadillo800eva-reference: Initialise TMU device using DT". You might want to 
credit him.

Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

> ---
>  arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
> b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts index
> 2703428557fce9fa..98504e0b06c8e2ca 100644
> --- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
> +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
> @@ -299,3 +299,7 @@
> 
>  	status = "okay";
>  };
> +
> +&tmu0 {
> +	status = "okay";
> +};

-- 
Regards,

Laurent Pinchart

Re: [PATCH 1/3] clocksource: sh_tmu: Document R-Mobile r8a7740 binding

[Laurent Pinchart]

Hi Geert,

Thank you for the patch.

On Wednesday 22 October 2014 11:38:27 Geert Uytterhoeven wrote:
> Compared to the r8a7779, the r8a7740 lacks the input capture register,
> which is not used by the driver (the current driver already handles the
> r8a7740 in the non-DT case).
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

> ---
>  Documentation/devicetree/bindings/timer/renesas,tmu.txt | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/timer/renesas,tmu.txt
> b/Documentation/devicetree/bindings/timer/renesas,tmu.txt index
> 7db89fb2544411b5..4ae7910af09ffcb4 100644
> --- a/Documentation/devicetree/bindings/timer/renesas,tmu.txt
> +++ b/Documentation/devicetree/bindings/timer/renesas,tmu.txt
> @@ -1,4 +1,4 @@
> -* Renesas R-Car Timer Unit (TMU)
> +* Renesas R-Mobile/R-Car Timer Unit (TMU)
> 
>  The TMU is a 32-bit timer/counter with configurable clock inputs and
>  programmable compare match.
> @@ -9,6 +9,7 @@ are independent. The TMU hardware supports up to three
> channels. Required Properties:
> 
>    - compatible: must contain one or more of the following:
> +    - "renesas,tmu-r8a7740" for the r8a7740 TMU
>      - "renesas,tmu-r8a7779" for the r8a7779 TMU
>      - "renesas,tmu" for any TMU.
>        This is a fallback for the above renesas,tmu-* entries

-- 
Regards,

Laurent Pinchart

Re: [PATCH 3/3] ARM: shmobile: armadillo800eva dts: Enable TMU0

[Geert Uytterhoeven]

On Wed, Oct 22, 2014 at 4:58 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Wednesday 22 October 2014 11:38:29 Geert Uytterhoeven wrote:
>> ch0 will be used for clock events and for periodic clock events,
>> ch1 will be used as clock source.
>>
>> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Simon has posted the same change as "[PATCH v2 20/30] ARM: shmobile:
> armadillo800eva-reference: Initialise TMU device using DT". You might want to
> credit him.

Bummer, didn't look hard enough...

Simon: what's the reason these hadn't been applied yet?
Likewise for r8a7778.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 1/3] clocksource: sh_tmu: Document R-Mobile r8a7740 binding

[Simon Horman]

On Wed, Oct 22, 2014 at 05:59:25PM +0300, Laurent Pinchart wrote:
> Hi Geert,
> 
> Thank you for the patch.
> 
> On Wednesday 22 October 2014 11:38:27 Geert Uytterhoeven wrote:
> > Compared to the r8a7779, the r8a7740 lacks the input capture register,
> > which is not used by the driver (the current driver already handles the
> > r8a7740 in the non-DT case).
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> 
> Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Acked-by: Simon Horman <horms+renesas@verge.net.au>

> 
> > ---
> >  Documentation/devicetree/bindings/timer/renesas,tmu.txt | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/timer/renesas,tmu.txt
> > b/Documentation/devicetree/bindings/timer/renesas,tmu.txt index
> > 7db89fb2544411b5..4ae7910af09ffcb4 100644
> > --- a/Documentation/devicetree/bindings/timer/renesas,tmu.txt
> > +++ b/Documentation/devicetree/bindings/timer/renesas,tmu.txt
> > @@ -1,4 +1,4 @@
> > -* Renesas R-Car Timer Unit (TMU)
> > +* Renesas R-Mobile/R-Car Timer Unit (TMU)
> > 
> >  The TMU is a 32-bit timer/counter with configurable clock inputs and
> >  programmable compare match.
> > @@ -9,6 +9,7 @@ are independent. The TMU hardware supports up to three
> > channels. Required Properties:
> > 
> >    - compatible: must contain one or more of the following:
> > +    - "renesas,tmu-r8a7740" for the r8a7740 TMU
> >      - "renesas,tmu-r8a7779" for the r8a7779 TMU
> >      - "renesas,tmu" for any TMU.
> >        This is a fallback for the above renesas,tmu-* entries
> 
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 3/3] ARM: shmobile: armadillo800eva dts: Enable TMU0

[Simon Horman]

On Wed, Oct 22, 2014 at 05:17:06PM +0200, Geert Uytterhoeven wrote:
> On Wed, Oct 22, 2014 at 4:58 PM, Laurent Pinchart
> <laurent.pinchart@ideasonboard.com> wrote:
> > On Wednesday 22 October 2014 11:38:29 Geert Uytterhoeven wrote:
> >> ch0 will be used for clock events and for periodic clock events,
> >> ch1 will be used as clock source.
> >>
> >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >
> > Simon has posted the same change as "[PATCH v2 20/30] ARM: shmobile:
> > armadillo800eva-reference: Initialise TMU device using DT". You might want to
> > credit him.
> 
> Bummer, didn't look hard enough...
> 
> Simon: what's the reason these hadn't been applied yet?
> Likewise for r8a7778.

Good question. It looks like a number of patches from that series
slipped through the cracks.

I have queued up your r8a7740 patches (patches 2 and 3 of this series)
and my r8a7778 patches. I have also queued up my r8a73a4 CMT1 patches
from the same series that Laurent referred to above.

Re: [PATCH 1/3] clocksource: sh_tmu: Document R-Mobile r8a7740 binding

[Simon Horman]

On Fri, Oct 24, 2014 at 11:34:55AM +0900, Simon Horman wrote:
> On Wed, Oct 22, 2014 at 05:59:25PM +0300, Laurent Pinchart wrote:
> > Hi Geert,
> > 
> > Thank you for the patch.
> > 
> > On Wednesday 22 October 2014 11:38:27 Geert Uytterhoeven wrote:
> > > Compared to the r8a7779, the r8a7740 lacks the input capture register,
> > > which is not used by the driver (the current driver already handles the
> > > r8a7740 in the non-DT case).
> > > 
> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > 
> > Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> Acked-by: Simon Horman <horms+renesas@verge.net.au>

It seems that I have committed the last few changes to this file,
so I've queued up this one too.