[PATCH 0/3] arm64: renesas: Add support for Salvator-XS with R-Car M3-W

[PATCH 0/3] arm64: renesas: Add support for Salvator-XS with R-Car M3-W

[Geert Uytterhoeven]

	Hi Simon, Magnus,

This patch series adds support for the version of the Salvator-XS
development board equipped with an R-Car M3-W SiP.

The DT was based on work for the Salvator-X and -XS boards with M3-W
resp. H3 SiPs.

This has been tested on Salvator-X with R-Car M3-W ES1.1.

Thanks!

Geert Uytterhoeven (3):
  ARM: shmobile: Document Renesas M3-W-based Salvator-XS board DT
    bindings
  soc: renesas: Identify R-Car M3-W ES1.1
  arm64: dts: renesas: Add support for Salvator-XS with R-Car M3-W

 Documentation/devicetree/bindings/arm/shmobile.txt |  2 +
 arch/arm64/boot/dts/renesas/Makefile               |  1 +
 .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 58 ++++++++++++++++++++++
 drivers/soc/renesas/renesas-soc.c                  |  3 ++
 4 files changed, 64 insertions(+)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts

-- 
2.7.4

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] ARM: shmobile: Document Renesas M3-W-based Salvator-XS board DT bindings

[Geert Uytterhoeven]

The Renesas Salvator-XS (Salvator-X 2nd version) development board can
be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
pin-compatible.

Document board part number and compatible values for the version with
R-Car M3-W.

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

diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 9d277e3b0e8d34d0..c69f93af2d143278 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -126,6 +126,8 @@ Boards:
     compatible = "renesas,salvator-x", "renesas,r8a7796"
   - Salvator-XS (Salvator-X 2nd version, RTP0RC7795SIPB0012S)
     compatible = "renesas,salvator-xs", "renesas,r8a7795"
+  - Salvator-XS (Salvator-X 2nd version, RTP0RC7796SIPB0012S)
+    compatible = "renesas,salvator-xs", "renesas,r8a7796"
   - SILK (RTP0RC7794LCB00011S)
     compatible = "renesas,silk", "renesas,r8a7794"
   - SK-RZG1E (YR8A77450S000BE)
-- 
2.7.4

[PATCH 2/3] soc: renesas: Identify R-Car M3-W ES1.1

[Geert Uytterhoeven]

The Product Register of R-Car M3-W ES1.1 incorrectly identifies the SoC
revision as ES2.0.  Add a workaround to fix this.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Is it already known how future revisions will be identified?
---
 drivers/soc/renesas/renesas-soc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
index f8389ed2249f9816..5c7f920ff060957a 100644
--- a/drivers/soc/renesas/renesas-soc.c
+++ b/drivers/soc/renesas/renesas-soc.c
@@ -293,6 +293,9 @@ static int __init renesas_soc_init(void)
 	if (chipid) {
 		product = readl(chipid);
 		iounmap(chipid);
+		/* R-Car M3-W ES1.1 incorrectly identifies as ES2.0 */
+		if ((product & 0x7fff) == 0x5210)
+			product ^= 0x11;
 		if (soc->id && ((product >> 8) & 0xff) != soc->id) {
 			pr_warn("SoC mismatch (product = 0x%x)\n", product);
 			return -ENODEV;
-- 
2.7.4

[PATCH 3/3] arm64: dts: renesas: Add support for Salvator-XS with R-Car M3-W

[Geert Uytterhoeven]

Add initial support for the Renesas Salvator-XS (Salvator-X 2nd version)
development board equipped with an R-Car M3-W SiP.

Based on work for the Salvator-X and -XS boards with M3-W resp. H3 SiPs.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/Makefile               |  1 +
 .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 58 ++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts

diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index b0d5af06e239206f..a78dafa81ea4bc41 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -5,6 +5,7 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb
 dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-h3ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb
 dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-m3ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb
 dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb
 
diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts
new file mode 100644
index 0000000000000000..2c37055efa94d3c3
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts
@@ -0,0 +1,58 @@
+/*
+ * Device Tree Source for the Salvator-X 2nd version board with R-Car M3-W
+ *
+ * Copyright (C) 2015-2017 Renesas Electronics Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+#include "r8a7796.dtsi"
+#include "salvator-xs.dtsi"
+
+/ {
+	model = "Renesas Salvator-X 2nd version board based on r8a7796";
+	compatible = "renesas,salvator-xs", "renesas,r8a7796";
+
+	memory@48000000 {
+		device_type = "memory";
+		/* first 128MB is reserved for secure area. */
+		reg = <0x0 0x48000000 0x0 0x78000000>;
+	};
+
+	memory@600000000 {
+		device_type = "memory";
+		reg = <0x6 0x00000000 0x0 0x80000000>;
+	};
+};
+
+&du {
+	clocks = <&cpg CPG_MOD 724>,
+		 <&cpg CPG_MOD 723>,
+		 <&cpg CPG_MOD 722>,
+		 <&cpg CPG_MOD 727>,
+		 <&versaclock6 1>,
+		 <&x21_clk>,
+		 <&versaclock6 2>;
+	clock-names = "du.0", "du.1", "du.2", "lvds.0",
+		      "dclkin.0", "dclkin.1", "dclkin.2";
+};
+
+&hdmi0 {
+	status = "okay";
+
+	ports {
+		port@1 {
+			reg = <1>;
+			rcar_dw_hdmi0_out: endpoint {
+				remote-endpoint = <&hdmi0_con>;
+			};
+		};
+	};
+};
+
+&hdmi0_con {
+	remote-endpoint = <&rcar_dw_hdmi0_out>;
+};
-- 
2.7.4

Re: [PATCH 2/3] soc: renesas: Identify R-Car M3-W ES1.1

[Simon Horman]

On Mon, Oct 30, 2017 at 06:29:58PM +0100, Geert Uytterhoeven wrote:
> The Product Register of R-Car M3-W ES1.1 incorrectly identifies the SoC
> revision as ES2.0.  Add a workaround to fix this.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> Is it already known how future revisions will be identified?

I'd like there to be some sort of conclusion to that discussion before
applying that patch (I seem to recall we discussed it some time ago
but I don't recall the outcome). The reason that I am being cautious here
is that it potentially has implications for old-kernel/new-SoC compatibility
which may be hard to fix later.

I am happy to apply the other patches in the series if you think that is
worthwhile.

[PATCH 2/3] soc: renesas: Identify R-Car M3-W ES1.1

[Simon Horman]

On Mon, Oct 30, 2017 at 06:29:58PM +0100, Geert Uytterhoeven wrote:
> The Product Register of R-Car M3-W ES1.1 incorrectly identifies the SoC
> revision as ES2.0.  Add a workaround to fix this.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> Is it already known how future revisions will be identified?

I'd like there to be some sort of conclusion to that discussion before
applying that patch (I seem to recall we discussed it some time ago
but I don't recall the outcome). The reason that I am being cautious here
is that it potentially has implications for old-kernel/new-SoC compatibility
which may be hard to fix later.

I am happy to apply the other patches in the series if you think that is
worthwhile.

Re: [PATCH 1/3] ARM: shmobile: Document Renesas M3-W-based Salvator-XS board DT bindings

[Rob Herring]

On Mon, Oct 30, 2017 at 06:29:57PM +0100, Geert Uytterhoeven wrote:
> The Renesas Salvator-XS (Salvator-X 2nd version) development board can
> be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
> pin-compatible.
> 
> Document board part number and compatible values for the version with
> R-Car M3-W.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
> ---
>  Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
>  1 file changed, 2 insertions(+)

Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

--
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 1/3] ARM: shmobile: Document Renesas M3-W-based Salvator-XS board DT bindings

[Rob Herring]

On Mon, Oct 30, 2017 at 06:29:57PM +0100, Geert Uytterhoeven wrote:
> The Renesas Salvator-XS (Salvator-X 2nd version) development board can
> be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
> pin-compatible.
> 
> Document board part number and compatible values for the version with
> R-Car M3-W.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
>  1 file changed, 2 insertions(+)

Acked-by: Rob Herring <robh@kernel.org>

[PATCH 1/3] ARM: shmobile: Document Renesas M3-W-based Salvator-XS board DT bindings

[Rob Herring]

On Mon, Oct 30, 2017 at 06:29:57PM +0100, Geert Uytterhoeven wrote:
> The Renesas Salvator-XS (Salvator-X 2nd version) development board can
> be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
> pin-compatible.
> 
> Document board part number and compatible values for the version with
> R-Car M3-W.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
>  1 file changed, 2 insertions(+)

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 1/3] ARM: shmobile: Document Renesas M3-W-based Salvator-XS board DT bindings

[Simon Horman]

On Wed, Nov 01, 2017 at 04:49:04PM -0500, Rob Herring wrote:
> On Mon, Oct 30, 2017 at 06:29:57PM +0100, Geert Uytterhoeven wrote:
> > The Renesas Salvator-XS (Salvator-X 2nd version) development board can
> > be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
> > pin-compatible.
> > 
> > Document board part number and compatible values for the version with
> > R-Car M3-W.
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
> > ---
> >  Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
> >  1 file changed, 2 insertions(+)
> 
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

Thanks, applied.
--
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 1/3] ARM: shmobile: Document Renesas M3-W-based Salvator-XS board DT bindings

[Simon Horman]

On Wed, Nov 01, 2017 at 04:49:04PM -0500, Rob Herring wrote:
> On Mon, Oct 30, 2017 at 06:29:57PM +0100, Geert Uytterhoeven wrote:
> > The Renesas Salvator-XS (Salvator-X 2nd version) development board can
> > be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
> > pin-compatible.
> > 
> > Document board part number and compatible values for the version with
> > R-Car M3-W.
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > ---
> >  Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
> >  1 file changed, 2 insertions(+)
> 
> Acked-by: Rob Herring <robh@kernel.org>

Thanks, applied.

[PATCH 1/3] ARM: shmobile: Document Renesas M3-W-based Salvator-XS board DT bindings

[Simon Horman]

On Wed, Nov 01, 2017 at 04:49:04PM -0500, Rob Herring wrote:
> On Mon, Oct 30, 2017 at 06:29:57PM +0100, Geert Uytterhoeven wrote:
> > The Renesas Salvator-XS (Salvator-X 2nd version) development board can
> > be equipped with either an R-Car H3 ES2.0 or M3-W ES1.x SiP, which are
> > pin-compatible.
> > 
> > Document board part number and compatible values for the version with
> > R-Car M3-W.
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > ---
> >  Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
> >  1 file changed, 2 insertions(+)
> 
> Acked-by: Rob Herring <robh@kernel.org>

Thanks, applied.

Re: [PATCH 2/3] soc: renesas: Identify R-Car M3-W ES1.1

[Simon Horman]

On Wed, Nov 01, 2017 at 09:42:38AM +0100, Simon Horman wrote:
> On Mon, Oct 30, 2017 at 06:29:58PM +0100, Geert Uytterhoeven wrote:
> > The Product Register of R-Car M3-W ES1.1 incorrectly identifies the SoC
> > revision as ES2.0.  Add a workaround to fix this.
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > ---
> > Is it already known how future revisions will be identified?
> 
> I'd like there to be some sort of conclusion to that discussion before
> applying that patch (I seem to recall we discussed it some time ago
> but I don't recall the outcome). The reason that I am being cautious here
> is that it potentially has implications for old-kernel/new-SoC compatibility
> which may be hard to fix later.
> 
> I am happy to apply the other patches in the series if you think that is
> worthwhile.

After some discussion off-list I am now satisfied that the approach you
have taken - to special case as identifying ES1.1 as what would otherwise
be identified ES2.0 - is not likely to cause problems with future SoC
releases.

I have applied this patch for v4.16.

[PATCH 2/3] soc: renesas: Identify R-Car M3-W ES1.1

[Simon Horman]

On Wed, Nov 01, 2017 at 09:42:38AM +0100, Simon Horman wrote:
> On Mon, Oct 30, 2017 at 06:29:58PM +0100, Geert Uytterhoeven wrote:
> > The Product Register of R-Car M3-W ES1.1 incorrectly identifies the SoC
> > revision as ES2.0.  Add a workaround to fix this.
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > ---
> > Is it already known how future revisions will be identified?
> 
> I'd like there to be some sort of conclusion to that discussion before
> applying that patch (I seem to recall we discussed it some time ago
> but I don't recall the outcome). The reason that I am being cautious here
> is that it potentially has implications for old-kernel/new-SoC compatibility
> which may be hard to fix later.
> 
> I am happy to apply the other patches in the series if you think that is
> worthwhile.

After some discussion off-list I am now satisfied that the approach you
have taken - to special case as identifying ES1.1 as what would otherwise
be identified ES2.0 - is not likely to cause problems with future SoC
releases.

I have applied this patch for v4.16.

Re: [PATCH 3/3] arm64: dts: renesas: Add support for Salvator-XS with R-Car M3-W

[Simon Horman]

On Mon, Oct 30, 2017 at 06:29:59PM +0100, Geert Uytterhoeven wrote:
> Add initial support for the Renesas Salvator-XS (Salvator-X 2nd version)
> development board equipped with an R-Car M3-W SiP.
> 
> Based on work for the Salvator-X and -XS boards with M3-W resp. H3 SiPs.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>

Thanks, applied for v4.16.
--
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] arm64: dts: renesas: Add support for Salvator-XS with R-Car M3-W

[Simon Horman]

On Mon, Oct 30, 2017 at 06:29:59PM +0100, Geert Uytterhoeven wrote:
> Add initial support for the Renesas Salvator-XS (Salvator-X 2nd version)
> development board equipped with an R-Car M3-W SiP.
> 
> Based on work for the Salvator-X and -XS boards with M3-W resp. H3 SiPs.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks, applied for v4.16.

[PATCH 3/3] arm64: dts: renesas: Add support for Salvator-XS with R-Car M3-W

[Simon Horman]

On Mon, Oct 30, 2017 at 06:29:59PM +0100, Geert Uytterhoeven wrote:
> Add initial support for the Renesas Salvator-XS (Salvator-X 2nd version)
> development board equipped with an R-Car M3-W SiP.
> 
> Based on work for the Salvator-X and -XS boards with M3-W resp. H3 SiPs.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks, applied for v4.16.