[PATCH 0/2] arm64: dts: renesas: Add support for M3ULCB with R-Car M3-W+

[PATCH 0/2] arm64: dts: renesas: Add support for M3ULCB with R-Car M3-W+

[Yuya Hamamachi]

This patchset adds devicetree for new M3ULCB board equipped with R-Car
M3-W+ (R8A77961) SoC.

Yuya Hamamachi (2):
  dt-bindings: arm: renesas: Add M3ULCB with R-Car M3-W+
  arm64: dts: renesas: Add support for M3ULCB with R-Car M3-W+

 .../devicetree/bindings/arm/renesas.yaml      |  1 +
 arch/arm64/boot/dts/renesas/Makefile          |  1 +
 arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 31 +++++++++++++++++++
 arch/arm64/boot/dts/renesas/r8a77961.dtsi     |  1 +
 4 files changed, 34 insertions(+)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts

-- 
2.25.1

[PATCH 1/2] dt-bindings: arm: renesas: Add M3ULCB with R-Car M3-W+

[Yuya Hamamachi]

Add device tree binding documentation for the Renesas M3ULCB board equipped
with an R-Car M3-W+ (R8A77961) SoC.

Signed-off-by: Yuya Hamamachi <yuya.hamamachi.sx@renesas.com>
---
 Documentation/devicetree/bindings/arm/renesas.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/arm/renesas.yaml b/Documentation/devicetree/bindings/arm/renesas.yaml
index 9436124c5809..611094d9186b 100644
--- a/Documentation/devicetree/bindings/arm/renesas.yaml
+++ b/Documentation/devicetree/bindings/arm/renesas.yaml
@@ -208,6 +208,7 @@ properties:
       - description: R-Car M3-W+ (R8A77961)
         items:
           - enum:
+              - renesas,m3ulcb # M3ULCB (R-Car Starter Kit Pro, RTP8J77961ASKB0SK0SA05A (M3 ES3.0))
               - renesas,salvator-xs # Salvator-XS (Salvator-X 2nd version, RTP0RC7796SIPB0012SA5A)
           - const: renesas,r8a77961
 
-- 
2.25.1

[PATCH 2/2] arm64: dts: renesas: Add support for M3ULCB with R-Car M3-W+

[Yuya Hamamachi]

Add initial support for the Renesas M3ULCB board equipped with an R-Car
M3-W+ SiP with 8 (2 x 4) GiB of RAM.
To avoid build error on 'ulcb.dtsi', ssi2 is added into 'r8a77961.dtsi'.

Based on commit 92980759c1699a3c10beb00f411270197ac89544
("arm64: dts: renesas: Add support for Salvator-XS with R-Car M3-W+").

Signed-off-by: Yuya Hamamachi <yuya.hamamachi.sx@renesas.com>
---
 arch/arm64/boot/dts/renesas/Makefile          |  1 +
 arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts | 31 +++++++++++++++++++
 arch/arm64/boot/dts/renesas/r8a77961.dtsi     |  1 +
 3 files changed, 33 insertions(+)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts

diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index 94d5ad03197d..a4c77d095ffb 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -12,6 +12,7 @@ dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-ulcb.dtb r8a77951-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb.dtb r8a77960-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-salvator-xs.dtb
+dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-ulcb.dtb
 dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb.dtb r8a77965-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb
diff --git a/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
new file mode 100644
index 000000000000..7db5c53dc8fc
--- /dev/null
+++ b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for the M3ULCB (R-Car Starter Kit Pro) board with R-Car M3-W+
+ *
+ * Copyright (C) 2020 Renesas Electronics Corp.
+ */
+
+/dts-v1/;
+#include "r8a77961.dtsi"
+#include "ulcb.dtsi"
+
+/ {
+	model = "Renesas M3ULCB board based on r8a77961";
+	compatible = "renesas,m3ulcb", "renesas,r8a77961";
+
+	memory@48000000 {
+		device_type = "memory";
+		/* first 128MB is reserved for secure area. */
+		reg = <0x0 0x48000000 0x0 0x78000000>;
+	};
+
+	memory@400000000 {
+		device_type = "memory";
+		reg = <0x4 0x80000000 0x0 0x80000000>;
+	};
+
+	memory@600000000 {
+		device_type = "memory";
+		reg = <0x6 0x00000000 0x1 0x00000000>;
+	};
+};
diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
index b6915319a61c..dce2a7d55ae5 100644
--- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
@@ -870,6 +870,7 @@ rcar_sound,src {
 			rcar_sound,ssi {
 				ssi0: ssi-0 { };
 				ssi1: ssi-1 { };
+				ssi2: ssi-2 { };
 			};
 		};
 
-- 
2.25.1

Re: [PATCH 2/2] arm64: dts: renesas: Add support for M3ULCB with R-Car M3-W+

[Sergei Shtylyov]

Hello!

On 09.03.2020 9:44, Yuya Hamamachi wrote:

> Add initial support for the Renesas M3ULCB board equipped with an R-Car
> M3-W+ SiP with 8 (2 x 4) GiB of RAM.
> To avoid build error on 'ulcb.dtsi', ssi2 is added into 'r8a77961.dtsi'.
> 
> Based on commit 92980759c1699a3c10beb00f411270197ac89544
> ("arm64: dts: renesas: Add support for Salvator-XS with R-Car M3-W+").
> 
> Signed-off-by: Yuya Hamamachi <yuya.hamamachi.sx@renesas.com>
[...]
> diff --git a/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
> new file mode 100644
> index 000000000000..7db5c53dc8fc
> --- /dev/null
> +++ b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
> @@ -0,0 +1,31 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Device Tree Source for the M3ULCB (R-Car Starter Kit Pro) board with R-Car M3-W+
> + *
> + * Copyright (C) 2020 Renesas Electronics Corp.
> + */
> +
> +/dts-v1/;
> +#include "r8a77961.dtsi"
> +#include "ulcb.dtsi"
> +
> +/ {
> +	model = "Renesas M3ULCB board based on r8a77961";
> +	compatible = "renesas,m3ulcb", "renesas,r8a77961";
> +
> +	memory@48000000 {
> +		device_type = "memory";
> +		/* first 128MB is reserved for secure area. */
> +		reg = <0x0 0x48000000 0x0 0x78000000>;
> +	};
> +
> +	memory@400000000 {
> +		device_type = "memory";
> +		reg = <0x4 0x80000000 0x0 0x80000000>;

   The "reg" property doesn't match the <unit-address> part of the node name 
above.

[...]

MBR, Sergei

Re: [PATCH 1/2] dt-bindings: arm: renesas: Add M3ULCB with R-Car M3-W+

[Geert Uytterhoeven]

On Mon, Mar 9, 2020 at 7:49 AM Yuya Hamamachi
<yuya.hamamachi.sx@renesas.com> wrote:
> Add device tree binding documentation for the Renesas M3ULCB board equipped
> with an R-Car M3-W+ (R8A77961) SoC.
>
> Signed-off-by: Yuya Hamamachi <yuya.hamamachi.sx@renesas.com>

Assuming the part number is correct,
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-devel for v5.7.

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 2/2] arm64: dts: renesas: Add support for M3ULCB with R-Car M3-W+

[Geert Uytterhoeven]

Hi Hamamachi-san,

On Mon, Mar 9, 2020 at 7:49 AM Yuya Hamamachi
<yuya.hamamachi.sx@renesas.com> wrote:
> Add initial support for the Renesas M3ULCB board equipped with an R-Car
> M3-W+ SiP with 8 (2 x 4) GiB of RAM.
> To avoid build error on 'ulcb.dtsi', ssi2 is added into 'r8a77961.dtsi'.
>
> Based on commit 92980759c1699a3c10beb00f411270197ac89544
> ("arm64: dts: renesas: Add support for Salvator-XS with R-Car M3-W+").
>
> Signed-off-by: Yuya Hamamachi <yuya.hamamachi.sx@renesas.com>

Thanks for your patch!

> --- /dev/null
> +++ b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
> @@ -0,0 +1,31 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Device Tree Source for the M3ULCB (R-Car Starter Kit Pro) board with R-Car M3-W+

The above long line needs to be split.

> + *
> + * Copyright (C) 2020 Renesas Electronics Corp.
> + */
> +
> +/dts-v1/;
> +#include "r8a77961.dtsi"
> +#include "ulcb.dtsi"
> +
> +/ {
> +       model = "Renesas M3ULCB board based on r8a77961";
> +       compatible = "renesas,m3ulcb", "renesas,r8a77961";
> +
> +       memory@48000000 {
> +               device_type = "memory";
> +               /* first 128MB is reserved for secure area. */
> +               reg = <0x0 0x48000000 0x0 0x78000000>;
> +       };
> +
> +       memory@400000000 {

As Sergei pointed out, the unit-address is wrong.
Interestingly, r8a77961-salvator-xs.dts has the same issue.
Will send a patch.

> +               device_type = "memory";
> +               reg = <0x4 0x80000000 0x0 0x80000000>;
> +       };
> +
> +       memory@600000000 {
> +               device_type = "memory";
> +               reg = <0x6 0x00000000 0x1 0x00000000>;
> +       };
> +};

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-devel for v5.7, with the above fixed.

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 2/2] arm64: dts: renesas: Add support for M3ULCB with R-Car M3-W+

[YUYA HAMAMACHI]

Hello,
Thank you for your reply.

> -----Original Message-----
> From: Geert Uytterhoeven <geert@linux-m68k.org>
> Sent: Monday, March 9, 2020 8:16 PM
> To: YUYA HAMAMACHI <yuya.hamamachi.sx@renesas.com>
> Cc: Linux-Renesas <linux-renesas-soc@vger.kernel.org>
> Subject: Re: [PATCH 2/2] arm64: dts: renesas: Add support for M3ULCB with
> R-Car M3-W+
> 
> Hi Hamamachi-san,
> 
> On Mon, Mar 9, 2020 at 7:49 AM Yuya Hamamachi
> <yuya.hamamachi.sx@renesas.com> wrote:
> > Add initial support for the Renesas M3ULCB board equipped with an
> > R-Car
> > M3-W+ SiP with 8 (2 x 4) GiB of RAM.
> > To avoid build error on 'ulcb.dtsi', ssi2 is added into 'r8a77961.dtsi'.
> >
> > Based on commit 92980759c1699a3c10beb00f411270197ac89544
> > ("arm64: dts: renesas: Add support for Salvator-XS with R-Car M3-W+").
> >
> > Signed-off-by: Yuya Hamamachi <yuya.hamamachi.sx@renesas.com>
> 
> Thanks for your patch!
> 
> > --- /dev/null
> > +++ b/arch/arm64/boot/dts/renesas/r8a77961-ulcb.dts
> > @@ -0,0 +1,31 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Device Tree Source for the M3ULCB (R-Car Starter Kit Pro) board
> > +with R-Car M3-W+
> 
> The above long line needs to be split.
> 
> > + *
> > + * Copyright (C) 2020 Renesas Electronics Corp.
> > + */
> > +
> > +/dts-v1/;
> > +#include "r8a77961.dtsi"
> > +#include "ulcb.dtsi"
> > +
> > +/ {
> > +       model = "Renesas M3ULCB board based on r8a77961";
> > +       compatible = "renesas,m3ulcb", "renesas,r8a77961";
> > +
> > +       memory@48000000 {
> > +               device_type = "memory";
> > +               /* first 128MB is reserved for secure area. */
> > +               reg = <0x0 0x48000000 0x0 0x78000000>;
> > +       };
> > +
> > +       memory@400000000 {
> 
> As Sergei pointed out, the unit-address is wrong.
> Interestingly, r8a77961-salvator-xs.dts has the same issue.
> Will send a patch.

I confirmed that patch in the BSP has same issue too.
# Maybe this patch:
#   https://github.com/renesas-rcar/linux-bsp/commit/30aa2f79e4afd90e10564b8ef816968e61d93c12
So, I think that r8a77961-salvator-xs.dts and this patch have same issue.

> > +               device_type = "memory";
> > +               reg = <0x4 0x80000000 0x0 0x80000000>;
> > +       };
> > +
> > +       memory@600000000 {
> > +               device_type = "memory";
> > +               reg = <0x6 0x00000000 0x1 0x00000000>;
> > +       };
> > +};
> 
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will queue
> in renesas-devel for v5.7, with the above fixed.

Thank you for your Reviewed-by !

Thank you for your help.
Best regards,
Yuya Hamamachi