[PATCH 0/5] ARM: dts: renesas: bring genmai up to date - the easy stuff

[PATCH 0/5] ARM: dts: renesas: bring genmai up to date - the easy stuff

[Wolfram Sang]

I recently rediscovered the Genmai board as a great platform for
regression testing (RIIC, pre R-Car SDHI and MMCIF). Its DTS file is a
bit outdated, though. This series adds the simple stuff, and reorganizes
it to be sorted. I want to add SDHI and MMCIF on top of this, but those
didn't work out of the box and need a little more work, probably.

Let's start with this seris first. Looking forward to comments.

Happy hacking,

   Wolfram


Wolfram Sang (5):
  ARM: dts: renesas: genmai: enable watchdog
  ARM: dts: renesas: genmai: enable OS timer modules
  ARM: dts: renesas: genmai: sort nodes
  ARM: dts: renesas: genmai: sort pinctrl entries
  ARM: dts: renesas: genmai: define keyboard switch

 arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 136 +++++++++++-------
 1 file changed, 85 insertions(+), 51 deletions(-)

-- 
2.45.2

[PATCH 1/5] ARM: dts: renesas: genmai: enable watchdog

[Wolfram Sang]

Driver has been submitted meanwhile. Activate the device.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
index 28e703e0f152..226bcff180bb 100644
--- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
@@ -228,3 +228,8 @@ codec: codec@0 {
 		spi-max-frequency = <5000000>;
 	};
 };
+
+&wdt {
+	timeout-sec = <60>;
+	status = "okay";
+};
-- 
2.45.2

[PATCH 2/5] ARM: dts: renesas: genmai: enable OS timer modules

[Wolfram Sang]

Driver has been submitted meanwhile. Activate the devices.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
index 226bcff180bb..c4c2d750ad79 100644
--- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
@@ -208,6 +208,14 @@ eeprom@50 {
 	};
 };
 
+&ostm0 {
+	status = "okay";
+};
+
+&ostm1 {
+	status = "okay";
+};
+
 &rtc {
 	status = "okay";
 };
-- 
2.45.2

[PATCH 3/5] ARM: dts: renesas: genmai: sort nodes

[Wolfram Sang]

To make future additions easier.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 102 +++++++++---------
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
index c4c2d750ad79..5728b1080ca6 100644
--- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
@@ -72,45 +72,6 @@ led2 {
 	};
 };
 
-&pinctrl {
-
-	scif2_pins: serial2 {
-		/* P3_0 as TxD2; P3_2 as RxD2 */
-		pinmux = <RZA1_PINMUX(3, 0, 6)>, <RZA1_PINMUX(3, 2, 4)>;
-	};
-
-	i2c2_pins: i2c2 {
-		/* RIIC2: P1_4 as SCL, P1_5 as SDA */
-		pinmux = <RZA1_PINMUX(1, 4, 1)>, <RZA1_PINMUX(1, 5, 1)>;
-	};
-
-	ether_pins: ether {
-		/* Ethernet on Ports 1,2,3,5 */
-		pinmux = <RZA1_PINMUX(1, 14, 4)>,/* P1_14 = ET_COL  */
-			 <RZA1_PINMUX(5, 9, 2)>, /* P5_9 = ET_MDC   */
-			 <RZA1_PINMUX(3, 3, 2)>, /* P3_3 = ET_MDIO */
-			 <RZA1_PINMUX(3, 4, 2)>, /* P3_4 = ET_RXCLK */
-			 <RZA1_PINMUX(3, 5, 2)>, /* P3_5 = ET_RXER  */
-			 <RZA1_PINMUX(3, 6, 2)>, /* P3_6 = ET_RXDV  */
-			 <RZA1_PINMUX(2, 0, 2)>, /* P2_0 = ET_TXCLK */
-			 <RZA1_PINMUX(2, 1, 2)>, /* P2_1 = ET_TXER  */
-			 <RZA1_PINMUX(2, 2, 2)>, /* P2_2 = ET_TXEN  */
-			 <RZA1_PINMUX(2, 3, 2)>, /* P2_3 = ET_CRS   */
-			 <RZA1_PINMUX(2, 4, 2)>, /* P2_4 = ET_TXD0  */
-			 <RZA1_PINMUX(2, 5, 2)>, /* P2_5 = ET_TXD1  */
-			 <RZA1_PINMUX(2, 6, 2)>, /* P2_6 = ET_TXD2  */
-			 <RZA1_PINMUX(2, 7, 2)>, /* P2_7 = ET_TXD3  */
-			 <RZA1_PINMUX(2, 8, 2)>, /* P2_8 = ET_RXD0  */
-			 <RZA1_PINMUX(2, 9, 2)>, /* P2_9 = ET_RXD1  */
-			 <RZA1_PINMUX(2, 10, 2)>,/* P2_10 = ET_RXD2 */
-			 <RZA1_PINMUX(2, 11, 2)>;/* P2_11 = ET_RXD3 */
-	};
-};
-
-&extal_clk {
-	clock-frequency = <13330000>;
-};
-
 &bsc {
 	flash@0 {
 		compatible = "cfi-flash";
@@ -167,18 +128,6 @@ partition@60000 {
 	};
 };
 
-&usb_x1_clk {
-	clock-frequency = <48000000>;
-};
-
-&rtc_x1_clk {
-	clock-frequency = <32768>;
-};
-
-&mtu2 {
-	status = "okay";
-};
-
 &ether {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ether_pins>;
@@ -194,6 +143,10 @@ phy0: ethernet-phy@0 {
 	};
 };
 
+&extal_clk {
+	clock-frequency = <13330000>;
+};
+
 &i2c2 {
 	status = "okay";
 	clock-frequency = <400000>;
@@ -208,6 +161,10 @@ eeprom@50 {
 	};
 };
 
+&mtu2 {
+	status = "okay";
+};
+
 &ostm0 {
 	status = "okay";
 };
@@ -216,6 +173,45 @@ &ostm1 {
 	status = "okay";
 };
 
+&pinctrl {
+
+	scif2_pins: serial2 {
+		/* P3_0 as TxD2; P3_2 as RxD2 */
+		pinmux = <RZA1_PINMUX(3, 0, 6)>, <RZA1_PINMUX(3, 2, 4)>;
+	};
+
+	i2c2_pins: i2c2 {
+		/* RIIC2: P1_4 as SCL, P1_5 as SDA */
+		pinmux = <RZA1_PINMUX(1, 4, 1)>, <RZA1_PINMUX(1, 5, 1)>;
+	};
+
+	ether_pins: ether {
+		/* Ethernet on Ports 1,2,3,5 */
+		pinmux = <RZA1_PINMUX(1, 14, 4)>,/* P1_14 = ET_COL  */
+			 <RZA1_PINMUX(5, 9, 2)>, /* P5_9 = ET_MDC   */
+			 <RZA1_PINMUX(3, 3, 2)>, /* P3_3 = ET_MDIO */
+			 <RZA1_PINMUX(3, 4, 2)>, /* P3_4 = ET_RXCLK */
+			 <RZA1_PINMUX(3, 5, 2)>, /* P3_5 = ET_RXER  */
+			 <RZA1_PINMUX(3, 6, 2)>, /* P3_6 = ET_RXDV  */
+			 <RZA1_PINMUX(2, 0, 2)>, /* P2_0 = ET_TXCLK */
+			 <RZA1_PINMUX(2, 1, 2)>, /* P2_1 = ET_TXER  */
+			 <RZA1_PINMUX(2, 2, 2)>, /* P2_2 = ET_TXEN  */
+			 <RZA1_PINMUX(2, 3, 2)>, /* P2_3 = ET_CRS   */
+			 <RZA1_PINMUX(2, 4, 2)>, /* P2_4 = ET_TXD0  */
+			 <RZA1_PINMUX(2, 5, 2)>, /* P2_5 = ET_TXD1  */
+			 <RZA1_PINMUX(2, 6, 2)>, /* P2_6 = ET_TXD2  */
+			 <RZA1_PINMUX(2, 7, 2)>, /* P2_7 = ET_TXD3  */
+			 <RZA1_PINMUX(2, 8, 2)>, /* P2_8 = ET_RXD0  */
+			 <RZA1_PINMUX(2, 9, 2)>, /* P2_9 = ET_RXD1  */
+			 <RZA1_PINMUX(2, 10, 2)>,/* P2_10 = ET_RXD2 */
+			 <RZA1_PINMUX(2, 11, 2)>;/* P2_11 = ET_RXD3 */
+	};
+};
+
+&rtc_x1_clk {
+	clock-frequency = <32768>;
+};
+
 &rtc {
 	status = "okay";
 };
@@ -237,6 +233,10 @@ codec: codec@0 {
 	};
 };
 
+&usb_x1_clk {
+	clock-frequency = <48000000>;
+};
+
 &wdt {
 	timeout-sec = <60>;
 	status = "okay";
-- 
2.45.2

[PATCH 4/5] ARM: dts: renesas: genmai: sort pinctrl entries

[Wolfram Sang]

To make future additions easier.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
index 5728b1080ca6..4f920afe0d62 100644
--- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
@@ -174,17 +174,6 @@ &ostm1 {
 };
 
 &pinctrl {
-
-	scif2_pins: serial2 {
-		/* P3_0 as TxD2; P3_2 as RxD2 */
-		pinmux = <RZA1_PINMUX(3, 0, 6)>, <RZA1_PINMUX(3, 2, 4)>;
-	};
-
-	i2c2_pins: i2c2 {
-		/* RIIC2: P1_4 as SCL, P1_5 as SDA */
-		pinmux = <RZA1_PINMUX(1, 4, 1)>, <RZA1_PINMUX(1, 5, 1)>;
-	};
-
 	ether_pins: ether {
 		/* Ethernet on Ports 1,2,3,5 */
 		pinmux = <RZA1_PINMUX(1, 14, 4)>,/* P1_14 = ET_COL  */
@@ -206,6 +195,16 @@ ether_pins: ether {
 			 <RZA1_PINMUX(2, 10, 2)>,/* P2_10 = ET_RXD2 */
 			 <RZA1_PINMUX(2, 11, 2)>;/* P2_11 = ET_RXD3 */
 	};
+
+	i2c2_pins: i2c2 {
+		/* RIIC2: P1_4 as SCL, P1_5 as SDA */
+		pinmux = <RZA1_PINMUX(1, 4, 1)>, <RZA1_PINMUX(1, 5, 1)>;
+	};
+
+	scif2_pins: serial2 {
+		/* P3_0 as TxD2; P3_2 as RxD2 */
+		pinmux = <RZA1_PINMUX(3, 0, 6)>, <RZA1_PINMUX(3, 2, 4)>;
+	};
 };
 
 &rtc_x1_clk {
-- 
2.45.2

[PATCH 5/5] ARM: dts: renesas: genmai: define keyboard switch

[Wolfram Sang]

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
index 4f920afe0d62..0ad3989859c4 100644
--- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
@@ -9,6 +9,7 @@
 /dts-v1/;
 #include "r7s72100.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 #include <dt-bindings/pinctrl/r7s72100-pinctrl.h>
 
 / {
@@ -58,6 +59,22 @@ partition@4000000 {
 		};
 	};
 
+	keyboard {
+		compatible = "gpio-keys";
+		interrupt-parent = <&irqc>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&keyboard_pins>;
+
+		key-1 {
+			/* JP3 must be set to 1-2 (default) */
+			interrupts = <6 IRQ_TYPE_EDGE_BOTH>;
+			linux,code = <KEY_1>;
+			label = "SW6,SW7";
+			wakeup-source;
+		};
+	};
+
 	leds {
 		status = "okay";
 		compatible = "gpio-leds";
@@ -201,6 +218,11 @@ i2c2_pins: i2c2 {
 		pinmux = <RZA1_PINMUX(1, 4, 1)>, <RZA1_PINMUX(1, 5, 1)>;
 	};
 
+	keyboard_pins: keyboard {
+		/* P3_1 as IRQ6 */
+		pinmux = <RZA1_PINMUX(3, 1, 3)>;
+	};
+
 	scif2_pins: serial2 {
 		/* P3_0 as TxD2; P3_2 as RxD2 */
 		pinmux = <RZA1_PINMUX(3, 0, 6)>, <RZA1_PINMUX(3, 2, 4)>;
-- 
2.45.2

Re: [PATCH 0/5] ARM: dts: renesas: bring genmai up to date - the easy stuff

[Rob Herring (Arm)]

On Sat, 21 Sep 2024 13:48:12 +0200, Wolfram Sang wrote:
> I recently rediscovered the Genmai board as a great platform for
> regression testing (RIIC, pre R-Car SDHI and MMCIF). Its DTS file is a
> bit outdated, though. This series adds the simple stuff, and reorganizes
> it to be sorted. I want to add SDHI and MMCIF on top of this, but those
> didn't work out of the box and need a little more work, probably.
> 
> Let's start with this seris first. Looking forward to comments.
> 
> Happy hacking,
> 
>    Wolfram
> 
> 
> Wolfram Sang (5):
>   ARM: dts: renesas: genmai: enable watchdog
>   ARM: dts: renesas: genmai: enable OS timer modules
>   ARM: dts: renesas: genmai: sort nodes
>   ARM: dts: renesas: genmai: sort pinctrl entries
>   ARM: dts: renesas: genmai: define keyboard switch
> 
>  arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 136 +++++++++++-------
>  1 file changed, 85 insertions(+), 51 deletions(-)
> 
> --
> 2.45.2
> 
> 
> 


My bot found new DTB warnings on the .dts files added or changed in this
series.

Some warnings may be from an existing SoC .dtsi. Or perhaps the warnings
are fixed by another series. Ultimately, it is up to the platform
maintainer whether these warnings are acceptable or not. No need to reply
unless the platform maintainer has comments.

If you already ran DT checks and didn't see these error(s), then
make sure dt-schema is up to date:

  pip3 install dtschema --upgrade


New warnings running 'make CHECK_DTBS=y renesas/r7s72100-genmai.dtb' for 20240921114813.4124-7-wsa+renesas@sang-engineering.com:

arch/arm/boot/dts/renesas/r7s72100-genmai.dtb: keyboard: 'interrupt-parent' does not match any of the regexes: '^(button|event|key|switch|(button|event|key|switch)-[a-z0-9-]+|[a-z0-9-]+-(button|event|key|switch))$', 'pinctrl-[0-9]+'
	from schema $id: http://devicetree.org/schemas/input/gpio-keys.yaml#

Re: [PATCH 0/5] ARM: dts: renesas: bring genmai up to date - the easy stuff

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]


> arch/arm/boot/dts/renesas/r7s72100-genmai.dtb: keyboard: 'interrupt-parent' does not match any of the regexes: '^(button|event|key|switch|(button|event|key|switch)-[a-z0-9-]+|[a-z0-9-]+-(button|event|key|switch))$', 'pinctrl-[0-9]+'
> 	from schema $id: http://devicetree.org/schemas/input/gpio-keys.yaml#

I fixed this by moving 'interrupt-parent' to 'key-1'. Checked with
dtbs_check now (which I needed to repair first becausde of a Python
version upgrade :/).

Geert, shall I resend the series or just the last patch?


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/5] ARM: dts: renesas: genmai: enable watchdog

[Geert Uytterhoeven]

On Sat, Sep 21, 2024 at 1:48 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> Driver has been submitted meanwhile. Activate the device.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-devel for v6.13.

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/5] ARM: dts: renesas: genmai: enable OS timer modules

[Geert Uytterhoeven]

On Sat, Sep 21, 2024 at 1:48 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> Driver has been submitted meanwhile. Activate the devices.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

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/5] ARM: dts: renesas: genmai: sort nodes

[Geert Uytterhoeven]

On Sat, Sep 21, 2024 at 1:48 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> To make future additions easier.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-devel for v6.13.

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 4/5] ARM: dts: renesas: genmai: sort pinctrl entries

[Geert Uytterhoeven]

Hi Wolfram,

On Sat, Sep 21, 2024 at 1:48 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> To make future additions easier.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Thanks for your patch!

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-devel for v6.13.

If you don't mind, I will fold this into the previous patch, and move
the /memory node while applying.

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 5/5] ARM: dts: renesas: genmai: define keyboard switch

[Geert Uytterhoeven]

On Sat, Sep 21, 2024 at 1:48 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-devel for v6.13...

> --- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts
> +++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts

> @@ -58,6 +59,22 @@ partition@4000000 {
>                 };
>         };
>
> +       keyboard {
> +               compatible = "gpio-keys";
> +               interrupt-parent = <&irqc>;

... with the interrupt-parent definition moved to the key-1 subnode.

> +
> +               pinctrl-names = "default";
> +               pinctrl-0 = <&keyboard_pins>;
> +
> +               key-1 {
> +                       /* JP3 must be set to 1-2 (default) */
> +                       interrupts = <6 IRQ_TYPE_EDGE_BOTH>;
> +                       linux,code = <KEY_1>;
> +                       label = "SW6,SW7";
> +                       wakeup-source;
> +               };
> +       };
> +
>         leds {
>                 status = "okay";
>                 compatible = "gpio-leds";

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 4/5] ARM: dts: renesas: genmai: sort pinctrl entries

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]


> If you don't mind, I will fold this into the previous patch, and move
> the /memory node while applying.

Super fine with me. Thank you for assisting!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]