[PATCH 0/3] ARM: dts: add ostm support for r7s72100

[PATCH 0/3] ARM: dts: add ostm support for r7s72100

[Chris Brandt]

This patch set enables the use of the newly created driver
renesas-ostm.c for the r7s72100 SoC.

This patch set depends on the acceptance of:
  [PATCH 1/2] dt-bindings: document renesas-ostm timer
  [PATCH 2/2] clocksource: Add renesas-ostm timer driver


Chris Brandt (3):
  ARM: dts: r7s72100: add ostm clock to device tree
  ARM: dts: r7s72100: add ostm to device tree
  ARM: dts: rskrza1: add ostm DT support

 arch/arm/boot/dts/r7s72100-rskrza1.dts     |  4 ++++
 arch/arm/boot/dts/r7s72100.dtsi            | 21 +++++++++++++++++++++
 include/dt-bindings/clock/r7s72100-clock.h |  4 ++++
 3 files changed, 29 insertions(+)

-- 
2.10.1

[PATCH 1/3] ARM: dts: r7s72100: add ostm clock to device tree

[Chris Brandt]

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
---
 arch/arm/boot/dts/r7s72100.dtsi            | 9 +++++++++
 include/dt-bindings/clock/r7s72100-clock.h | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 3dd427d..d5946df 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -108,6 +108,15 @@
 			clock-output-names = "scif0", "scif1", "scif2", "scif3", "scif4", "scif5", "scif6", "scif7";
 		};
 
+		mstp5_clks: mstp5_clks@fcfe0428 {
+			#clock-cells = <1>;
+			compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
+			reg = <0xfcfe0428 4>;
+			clocks = <&p0_clk>, <&p0_clk>;
+			clock-indices = <R7S72100_CLK_OSTM0 R7S72100_CLK_OSTM1>;
+			clock-output-names = "ostm0", "ostm1";
+		};
+
 		mstp7_clks: mstp7_clks@fcfe0430 {
 			#clock-cells = <1>;
 			compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r7s72100-clock.h b/include/dt-bindings/clock/r7s72100-clock.h
index 29e01ed..ce09915 100644
--- a/include/dt-bindings/clock/r7s72100-clock.h
+++ b/include/dt-bindings/clock/r7s72100-clock.h
@@ -25,6 +25,10 @@
 #define R7S72100_CLK_SCIF6	1
 #define R7S72100_CLK_SCIF7	0
 
+/* MSTP5 */
+#define R7S72100_CLK_OSTM0	1
+#define R7S72100_CLK_OSTM1	0
+
 /* MSTP7 */
 #define R7S72100_CLK_ETHER	4
 
-- 
2.10.1

[PATCH 2/3] ARM: dts: r7s72100: add ostm to device tree

[Chris Brandt]

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
---
 arch/arm/boot/dts/r7s72100.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index d5946df..247bbe0 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -505,4 +505,15 @@
 		cap-sdio-irq;
 		status = "disabled";
 	};
+
+	ostm: ostm@fcfec000 {
+		compatible = "renesas,ostm-r7s72100", "renesas,ostm";
+		reg = <0xfcfec000 0x30>,
+		      <0xfcfec400 0x30>;
+		interrupts = <GIC_SPI 102 IRQ_TYPE_EDGE_RISING
+			      GIC_SPI 103 IRQ_TYPE_EDGE_RISING>;
+
+		clocks = <&mstp5_clks R7S72100_CLK_OSTM0>, <&mstp5_clks R7S72100_CLK_OSTM1>;
+		status = "disabled";
+	};
 };
-- 
2.10.1

[PATCH 3/3] ARM: dts: rskrza1: add ostm DT support

[Chris Brandt]

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
---
 arch/arm/boot/dts/r7s72100-rskrza1.dts | 4 ++++
 arch/arm/boot/dts/r7s72100.dtsi        | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r7s72100-rskrza1.dts b/arch/arm/boot/dts/r7s72100-rskrza1.dts
index dd44181..e7b6afa 100644
--- a/arch/arm/boot/dts/r7s72100-rskrza1.dts
+++ b/arch/arm/boot/dts/r7s72100-rskrza1.dts
@@ -61,6 +61,10 @@
 	status = "okay";
 };
 
+&ostm {
+	status = "okay";
+};
+
 &scif2 {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 247bbe0..974c084 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -513,7 +513,8 @@
 		interrupts = <GIC_SPI 102 IRQ_TYPE_EDGE_RISING
 			      GIC_SPI 103 IRQ_TYPE_EDGE_RISING>;
 
-		clocks = <&mstp5_clks R7S72100_CLK_OSTM0>, <&mstp5_clks R7S72100_CLK_OSTM1>;
+		clocks = <&mstp5_clks R7S72100_CLK_OSTM0>,
+			 <&mstp5_clks R7S72100_CLK_OSTM1>;
 		status = "disabled";
 	};
 };
-- 
2.10.1

Re: [PATCH 1/3] ARM: dts: r7s72100: add ostm clock to device tree

[Geert Uytterhoeven]

On Thu, Jan 12, 2017 at 8:01 PM, Chris Brandt <chris.brandt-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org> wrote:
> Signed-off-by: Chris Brandt <chris.brandt-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>

Reviewed-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.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
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/3] ARM: dts: rskrza1: add ostm DT support

[Geert Uytterhoeven]

Hi Chris,

On Thu, Jan 12, 2017 at 8:01 PM, Chris Brandt <chris.brandt@renesas.com> wrote:
> --- a/arch/arm/boot/dts/r7s72100.dtsi
> +++ b/arch/arm/boot/dts/r7s72100.dtsi
> @@ -513,7 +513,8 @@
>                 interrupts = <GIC_SPI 102 IRQ_TYPE_EDGE_RISING
>                               GIC_SPI 103 IRQ_TYPE_EDGE_RISING>;
>
> -               clocks = <&mstp5_clks R7S72100_CLK_OSTM0>, <&mstp5_clks R7S72100_CLK_OSTM1>;
> +               clocks = <&mstp5_clks R7S72100_CLK_OSTM0>,
> +                        <&mstp5_clks R7S72100_CLK_OSTM1>;

I think this change should be folded into "[PATCH 2/3] ARM: dts: r7s72100: add
ostm to device tree" ;-)

>                 status = "disabled";
>         };
>  };

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 3/3] ARM: dts: rskrza1: add ostm DT support

[Sergei Shtylyov]

Hello!

On 1/12/2017 10:01 PM, Chris Brandt wrote:

> Signed-off-by: Chris Brandt <chris.brandt-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
[...]
> diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
> index 247bbe0..974c084 100644
> --- a/arch/arm/boot/dts/r7s72100.dtsi
> +++ b/arch/arm/boot/dts/r7s72100.dtsi
> @@ -513,7 +513,8 @@
>  		interrupts = <GIC_SPI 102 IRQ_TYPE_EDGE_RISING
>  			      GIC_SPI 103 IRQ_TYPE_EDGE_RISING>;
>
> -		clocks = <&mstp5_clks R7S72100_CLK_OSTM0>, <&mstp5_clks R7S72100_CLK_OSTM1>;
> +		clocks = <&mstp5_clks R7S72100_CLK_OSTM0>,
> +			 <&mstp5_clks R7S72100_CLK_OSTM1>;

    Unintended change?

>  		status = "disabled";
>  	};
>  };

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH 3/3] ARM: dts: rskrza1: add ostm DT support

[Chris Brandt]

Hi Geert and Sergei,

On Friday, January 13, 2017, Geert Uytterhoeven wrote:
> On Thu, Jan 12, 2017 at 8:01 PM, Chris Brandt <chris.brandt@renesas.com>
> wrote:
> > --- a/arch/arm/boot/dts/r7s72100.dtsi
> > +++ b/arch/arm/boot/dts/r7s72100.dtsi
> > @@ -513,7 +513,8 @@
> >                 interrupts = <GIC_SPI 102 IRQ_TYPE_EDGE_RISING
> >                               GIC_SPI 103 IRQ_TYPE_EDGE_RISING>;
> >
> > -               clocks = <&mstp5_clks R7S72100_CLK_OSTM0>, <&mstp5_clks
> R7S72100_CLK_OSTM1>;
> > +               clocks = <&mstp5_clks R7S72100_CLK_OSTM0>,
> > +                        <&mstp5_clks R7S72100_CLK_OSTM1>;
> 
> I think this change should be folded into "[PATCH 2/3] ARM: dts: r7s72100:
> add ostm to device tree" ;-)

Oops, I think I got things a little screwed up when git rebasing and
reordering and such.

Thanks for the review!

Chris