Skip to contentSkip to conversation

arm64: dts: renesas: Add support for more R-Car V4H and White Hawk variants

PATCH Superseded Geert Uytterhoeven 3 participants 21 messages Dec 11, 2023 – Jan 24, 2024

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Geert Uytterhoeven

author maintainer
#0 lore raw

cover arm64: dts: renesas: Add support for more R-Car V4H and White Hawk variants

Hi all,

This RFC patch series extends the existing support for the Renesas White Hawk CPU and Breakout board stack by adding support for:
1. Standalone use of the White Hawk CPU board,
2. The White Hawk Single board, which is a single-board integration of the Renesas White Hawk CPU and Breakout board stack, based on the R-Car V4H ES2.0 (R8A779G2) SoC.

Main topics for bike-shedding^Wdiscussion are the new compatible values, and the naming of new DTS files.

Thanks for your comments!

Geert Uytterhoeven (7):
[RFC] dt-bindings: soc: renesas: Document R-Car V4H White Hawk Single
arm64: dts: renesas: r8a779g0: Add standalone White Hawk CPU support
arm64: dts: renesas: Add Renesas R8A779G2 SoC support
arm64: dts: renesas: Drop SoC part from White Hawk sub boards
arm64: dts: renesas: r8a779g0: white-hawk-cpu: Factor out common parts
arm64: dts: renesas: r8a779g0: white-hawk: Factor out common parts
arm64: dts: renesas: r8a779g0: Add White Hawk Single support

 .../bindings/soc/renesas/renesas.yaml         |   7 +
 arch/arm64/boot/dts/renesas/Makefile          |   3 +
 .../dts/renesas/r8a779g0-white-hawk-cpu.dts   |  13 +
 .../dts/renesas/r8a779g0-white-hawk-cpu.dtsi  | 365 +-----------------
 .../boot/dts/renesas/r8a779g0-white-hawk.dts  |  56 +--
 .../renesas/r8a779g2-white-hawk-single.dts    |  28 ++
 arch/arm64/boot/dts/renesas/r8a779g2.dtsi     |  12 +
 ...-white-hawk.dts => white-hawk-common.dtsi} |  12 +-
 ...wk-cpu.dtsi => white-hawk-cpu-common.dtsi} |  24 +-
 ...k-csi-dsi.dtsi => white-hawk-csi-dsi.dtsi} |   2 +-
 ...ethernet.dtsi => white-hawk-ethernet.dtsi} |   2 +-
 11 files changed, 84 insertions(+), 440 deletions(-)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dts
 create mode 100644 arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dts
 create mode 100644 arch/arm64/boot/dts/renesas/r8a779g2.dtsi
 copy arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk.dts => white-hawk-common.dtsi} (71%)
 copy arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-cpu.dtsi => white-hawk-cpu-common.dtsi} (97%)
 rename arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-csi-dsi.dtsi => white-hawk-csi-dsi.dtsi} (97%)
 rename arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-ethernet.dtsi => white-hawk-ethernet.dtsi} (76%)
Signature · 12 lines
2.34.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
author maintainer
#1 lore raw

PATCH 1/7 dt-bindings: soc: renesas: Document R-Car V4H White Hawk Single

Document the compatible values for the Renesas R-Car V4H ES2.0 (R8A779G2) SoC and the Renesas White Hawk Single board.
The former is an updated version of R-Car V4H (R8A779G0). The latter is a single-board integration of the Renesas White Hawk CPU and Breakout board stack.

---
Or just drop the "-single" suffix? The original board stack has a "-breakout" suffix.
The DTBs are called r8a779g0-white-hawk.dtb vs. r8a779g2-white-hawk-single.dtb, and I think we better don't rename the former.

---
 Documentation/devicetree/bindings/soc/renesas/renesas.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/soc/renesas/renesas.yaml +7 -0
index 1bb5888988119455..cc0d699f660f3ca1 100644
@@ -376,6 +376,13 @@ properties:
               - renesas,white-hawk-cpu # White Hawk CPU board (RTP8A779G0ASKB0FC0SA000)
           - const: renesas,r8a779g0
 
+      - description: R-Car V4H (R8A779G2)
+        items:
+          - enum:
+              - renesas,white-hawk-single # White Hawk Single board (RTP8A779G2ASKB0F10SA001)
+          - const: renesas,r8a779g2
+          - const: renesas,r8a779g0
+
       - items:
           - enum:
               - renesas,white-hawk-breakout # White Hawk BreakOut board (RTP8A779G0ASKB0SB0SA000)
Signature · 1 line
2.34.1
Reviewed-by on v1 1/7
#2 lore raw

Re: [PATCH/RFC 1/7] dt-bindings: soc: renesas: Document R-Car V4H White Hawk Single

Quoted 7 lines · Geert Uytterhoeven

Document the compatible values for the Renesas R-Car V4H ES2.0 (R8A779G2) SoC and the Renesas White Hawk Single board.
The former is an updated version of R-Car V4H (R8A779G0). The latter is a single-board integration of the Renesas White Hawk CPU and Breakout board stack.

Quoted 5 lines

Or just drop the "-single" suffix? The original board stack has a "-breakout" suffix.
The DTBs are called r8a779g0-white-hawk.dtb vs. r8a779g2-white-hawk-single.dtb, and I think we better don't rename the former.

I agree with not renaming the former.

I also think that the "-single" suffix to the filename is the most descriptive solution, both for the source as well as the binary.

author maintainer
#3 lore raw

PATCH 2/7 arm64: dts: renesas: r8a779g0: Add standalone White Hawk CPU support

In reply to Geert Uytterhoeven

The White Hawk CPU board can be used standalone, without connecting it to the White Hawk BreakOut board.

Add a DTS file for supporting this use case.

---
 arch/arm64/boot/dts/renesas/Makefile                |  1 +
 .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dts    | 13 +++++++++++++
 .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi   |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dts
arch/arm64/boot/dts/renesas/Makefile +1 -0
index 64f4b9d09c97b2bd..5209ca9cdf8433c1 100644
@@ -82,6 +82,7 @@ dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb
 dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f4-s4sk.dtb
 
 dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk.dtb
+dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-cpu.dtb
 dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtbo
 r8a779g0-white-hawk-ard-audio-da7212-dtbs := r8a779g0-white-hawk.dtb r8a779g0-white-hawk-ard-audio-da7212.dtbo
 dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtb
arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dts new file +13 -0
new file mode 100644
index 0000000000000000..c8b1bb50a8cfeb66
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/*
+ * Device Tree Source for the standalone R-Car V4H White Hawk CPU board
+ *
+ * Copyright (C) 2023 Glider bv
+ */
+
+/dts-v1/;
+#include "r8a779g0-white-hawk-cpu.dtsi"
+
+/ {
+	model = "Renesas White Hawk CPU board based on r8a779g0";
+};
arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +1 -1
index bb4a5270f71b6a75..4dcbe50fabb6f0db 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 /*
- * Device Tree Source for the White Hawk CPU board
+ * Device Tree Source for the R-Car V4H White Hawk CPU board
  *
  * Copyright (C) 2022 Renesas Electronics Corp.
  */
Signature · 1 line
2.34.1
author maintainer
#5 lore raw

PATCH 3/7 arm64: dts: renesas: Add Renesas R8A779G2 SoC support

In reply to Geert Uytterhoeven

Add support for the Renesas R-Car V4H ES2.0 (R8A779G2) SoC, which is an updated version of the R-Car V4H (R8A779G0) SoC.

---
 arch/arm64/boot/dts/renesas/r8a779g2.dtsi | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a779g2.dtsi
arch/arm64/boot/dts/renesas/r8a779g2.dtsi new file +12 -0
new file mode 100644
index 0000000000000000..e08f531843e28b7f
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/*
+ * Device Tree Source for the R-Car V4H (R8A779G2) SoC
+ *
+ * Copyright (C) 2023 Glider bv
+ */
+
+#include "r8a779g0.dtsi"
+
+/ {
+	compatible = "renesas,r8a779g2", "renesas,r8a779g0";
+};
Signature · 1 line
2.34.1
author maintainer
#7 lore raw

PATCH 4/7 arm64: dts: renesas: Drop SoC part from White Hawk sub boards

In reply to Geert Uytterhoeven

The White Hawk CSI/DSI and RAVB/Ethernet(1000Base-T1) sub boards are not specific to R-Car V4H.

Hence rename their DTS file names to drop the "r8a779g0-" prefix, and remove any references to R-Car V4H.

---
 arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts           | 4 ++--
 ...a779g0-white-hawk-csi-dsi.dtsi => white-hawk-csi-dsi.dtsi} | 2 +-
 ...79g0-white-hawk-ethernet.dtsi => white-hawk-ethernet.dtsi} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-csi-dsi.dtsi => white-hawk-csi-dsi.dtsi} (97%)
 rename arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-ethernet.dtsi => white-hawk-ethernet.dtsi} (76%)
arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts +2 -2
index eff1ef6e2cc83aba..8d82294a1a56444c 100644
@@ -7,8 +7,8 @@
 
 /dts-v1/;
 #include "r8a779g0-white-hawk-cpu.dtsi"
-#include "r8a779g0-white-hawk-csi-dsi.dtsi"
-#include "r8a779g0-white-hawk-ethernet.dtsi"
+#include "white-hawk-csi-dsi.dtsi"
+#include "white-hawk-ethernet.dtsi"
 
 / {
 	model = "Renesas White Hawk CPU and Breakout boards based on r8a779g0";
arch/arm64/boot/dts/renesas/white-hawk-csi-dsi.dtsi renamed from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-csi-dsi.dtsi +1 -1
similarity index 97%
rename from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-csi-dsi.dtsi
rename to arch/arm64/boot/dts/renesas/white-hawk-csi-dsi.dtsi
index f8537f7ea4defaba..3006b0a64f41e625 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 /*
- * Device Tree Source for the R-Car V4H White Hawk CSI/DSI sub-board
+ * Device Tree Source for the White Hawk CSI/DSI sub-board
  *
  * Copyright (C) 2022 Glider bv
  */
arch/arm64/boot/dts/renesas/white-hawk-ethernet.dtsi renamed from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ethernet.dtsi +1 -1
similarity index 76%
rename from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ethernet.dtsi
rename to arch/arm64/boot/dts/renesas/white-hawk-ethernet.dtsi
index 4f411f95c674bd51..a218fda337cf4308 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 /*
- * Device Tree Source for the R-Car V4H White Hawk RAVB/Ethernet(1000Base-T1)
+ * Device Tree Source for the White Hawk RAVB/Ethernet(1000Base-T1)
  * sub-board
  *
  * Copyright (C) 2022 Glider bv
Signature · 1 line
2.34.1
Reviewed-by on v1 4/7
#8 lore raw

Re: [PATCH/RFC 4/7] arm64: dts: renesas: Drop SoC part from White Hawk sub boards

Quoted 7 lines · Geert Uytterhoeven

The White Hawk CSI/DSI and RAVB/Ethernet(1000Base-T1) sub boards are not specific to R-Car V4H.

Hence rename their DTS file names to drop the "r8a779g0-" prefix, and remove any references to R-Car V4H.

author maintainer
#9 lore raw

PATCH 5/7 arm64: dts: renesas: r8a779g0: white-hawk-cpu: Factor out common parts

In reply to Geert Uytterhoeven

Factor out the parts on the White Hawk CPU board that are also present on the White Hawk Single board, so they can be reused when introducing support for the latter.

---
 .../dts/renesas/r8a779g0-white-hawk-cpu.dtsi  | 363 +-----------------
 ...wk-cpu.dtsi => white-hawk-cpu-common.dtsi} |  24 +-
 2 files changed, 13 insertions(+), 374 deletions(-)
 copy arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-cpu.dtsi => white-hawk-cpu-common.dtsi} (97%)
arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +1 -362
index 4dcbe50fabb6f0db..b1fe1aedc27d151d 100644
@@ -6,370 +6,9 @@
  */
 
 #include "r8a779g0.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
+#include "white-hawk-cpu-common.dtsi"
 
 / {
 	model = "Renesas White Hawk CPU board";
 	compatible = "renesas,white-hawk-cpu", "renesas,r8a779g0";
-
-	aliases {
-		ethernet0 = &avb0;
-		serial0 = &hscif0;
-	};
-
-	chosen {
-		bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";
-		stdout-path = "serial0:921600n8";
-	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		pinctrl-0 = <&keys_pins>;
-		pinctrl-names = "default";
-
-		key-1 {
-			gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_1>;
-			label = "SW47";
-			wakeup-source;
-			debounce-interval = <20>;
-		};
-
-		key-2 {
-			gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_2>;
-			label = "SW48";
-			wakeup-source;
-			debounce-interval = <20>;
-		};
-
-		key-3 {
-			gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_3>;
-			label = "SW49";
-			wakeup-source;
-			debounce-interval = <20>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led-1 {
-			gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
-			color = <LED_COLOR_ID_GREEN>;
-			function = LED_FUNCTION_INDICATOR;
-			function-enumerator = <1>;
-		};
-
-		led-2 {
-			gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
-			color = <LED_COLOR_ID_GREEN>;
-			function = LED_FUNCTION_INDICATOR;
-			function-enumerator = <2>;
-		};
-
-		led-3 {
-			gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>;
-			color = <LED_COLOR_ID_GREEN>;
-			function = LED_FUNCTION_INDICATOR;
-			function-enumerator = <3>;
-		};
-	};
-
-	memory@48000000 {
-		device_type = "memory";
-		/* first 128MB is reserved for secure area. */
-		reg = <0x0 0x48000000 0x0 0x78000000>;
-	};
-
-	memory@480000000 {
-		device_type = "memory";
-		reg = <0x4 0x80000000 0x0 0x80000000>;
-	};
-
-	memory@600000000 {
-		device_type = "memory";
-		reg = <0x6 0x00000000 0x1 0x00000000>;
-	};
-
-	mini-dp-con {
-		compatible = "dp-connector";
-		label = "CN5";
-		type = "mini";
-
-		port {
-			mini_dp_con_in: endpoint {
-				remote-endpoint = <&sn65dsi86_out>;
-			};
-		};
-	};
-
-	reg_1p2v: regulator-1p2v {
-		compatible = "regulator-fixed";
-		regulator-name = "fixed-1.2V";
-		regulator-min-microvolt = <1200000>;
-		regulator-max-microvolt = <1200000>;
-		regulator-boot-on;
-		regulator-always-on;
-	};
-
-	reg_1p8v: regulator-1p8v {
-		compatible = "regulator-fixed";
-		regulator-name = "fixed-1.8V";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-boot-on;
-		regulator-always-on;
-	};
-
-	reg_3p3v: regulator-3p3v {
-		compatible = "regulator-fixed";
-		regulator-name = "fixed-3.3V";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-boot-on;
-		regulator-always-on;
-	};
-
-	sn65dsi86_refclk: clk-x6 {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <38400000>;
-	};
-};
-
-&avb0 {
-	pinctrl-0 = <&avb0_pins>;
-	pinctrl-names = "default";
-	phy-handle = <&phy0>;
-	tx-internal-delay-ps = <2000>;
-	status = "okay";
-
-	phy0: ethernet-phy@0 {
-		compatible = "ethernet-phy-id0022.1622",
-			     "ethernet-phy-ieee802.3-c22";
-		rxc-skew-ps = <1500>;
-		reg = <0>;
-		interrupt-parent = <&gpio7>;
-		interrupts = <5 IRQ_TYPE_LEVEL_LOW>;
-		reset-gpios = <&gpio7 10 GPIO_ACTIVE_LOW>;
-	};
-};
-
-&dsi0 {
-	status = "okay";
-
-	ports {
-		port@1 {
-			dsi0_out: endpoint {
-				remote-endpoint = <&sn65dsi86_in>;
-				data-lanes = <1 2 3 4>;
-			};
-		};
-	};
-};
-
-&du {
-	status = "okay";
-};
-
-&extal_clk {
-	clock-frequency = <16666666>;
-};
-
-&extalr_clk {
-	clock-frequency = <32768>;
-};
-
-&hscif0 {
-	status = "okay";
-};
-
-&i2c0 {
-	pinctrl-0 = <&i2c0_pins>;
-	pinctrl-names = "default";
-
-	status = "okay";
-	clock-frequency = <400000>;
-
-	io_expander_a: gpio@20 {
-		compatible = "onnn,pca9654";
-		reg = <0x20>;
-		interrupt-parent = <&gpio0>;
-		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
-		gpio-controller;
-		#gpio-cells = <2>;
-		interrupt-controller;
-		#interrupt-cells = <2>;
-	};
-
-	eeprom@50 {
-		compatible = "rohm,br24g01", "atmel,24c01";
-		label = "cpu-board";
-		reg = <0x50>;
-		pagesize = <8>;
-	};
-};
-
-&i2c1 {
-	pinctrl-0 = <&i2c1_pins>;
-	pinctrl-names = "default";
-
-	status = "okay";
-	clock-frequency = <400000>;
-
-	bridge@2c {
-		compatible = "ti,sn65dsi86";
-		reg = <0x2c>;
-
-		clocks = <&sn65dsi86_refclk>;
-		clock-names = "refclk";
-
-		interrupt-parent = <&intc_ex>;
-		interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
-
-		enable-gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
-
-		vccio-supply = <&reg_1p8v>;
-		vpll-supply = <&reg_1p8v>;
-		vcca-supply = <&reg_1p2v>;
-		vcc-supply = <&reg_1p2v>;
-
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			port@0 {
-				reg = <0>;
-				sn65dsi86_in: endpoint {
-					remote-endpoint = <&dsi0_out>;
-				};
-			};
-
-			port@1 {
-				reg = <1>;
-				sn65dsi86_out: endpoint {
-					remote-endpoint = <&mini_dp_con_in>;
-				};
-			};
-		};
-	};
-};
-
-&mmc0 {
-	pinctrl-0 = <&mmc_pins>;
-	pinctrl-1 = <&mmc_pins>;
-	pinctrl-names = "default", "state_uhs";
-
-	vmmc-supply = <&reg_3p3v>;
-	vqmmc-supply = <&reg_1p8v>;
-	mmc-hs200-1_8v;
-	mmc-hs400-1_8v;
-	bus-width = <8>;
-	no-sd;
-	no-sdio;
-	non-removable;
-	full-pwr-cycle-in-suspend;
-	status = "okay";
-};
-
-&pfc {
-	pinctrl-0 = <&scif_clk_pins>;
-	pinctrl-names = "default";
-
-	avb0_pins: avb0 {
-		mux {
-			groups = "avb0_link", "avb0_mdio", "avb0_rgmii",
-				 "avb0_txcrefclk";
-			function = "avb0";
-		};
-
-		pins_mdio {
-			groups = "avb0_mdio";
-			drive-strength = <21>;
-		};
-
-		pins_mii {
-			groups = "avb0_rgmii";
-			drive-strength = <21>;
-		};
-
-	};
-	hscif0_pins: hscif0 {
-		groups = "hscif0_data";
-		function = "hscif0";
-	};
-
-	i2c0_pins: i2c0 {
-		groups = "i2c0";
-		function = "i2c0";
-	};
-
-	i2c1_pins: i2c1 {
-		groups = "i2c1";
-		function = "i2c1";
-	};
-
-	keys_pins: keys {
-		pins = "GP_5_0", "GP_5_1", "GP_5_2";
-		bias-pull-up;
-	};
-
-	mmc_pins: mmc {
-		groups = "mmc_data8", "mmc_ctrl", "mmc_ds";
-		function = "mmc";
-		power-source = <1800>;
-	};
-
-	qspi0_pins: qspi0 {
-		groups = "qspi0_ctrl", "qspi0_data4";
-		function = "qspi0";
-	};
-
-	scif_clk_pins: scif_clk {
-		groups = "scif_clk";
-		function = "scif_clk";
-	};
-};
-
-&rpc {
-	pinctrl-0 = <&qspi0_pins>;
-	pinctrl-names = "default";
-
-	status = "okay";
-
-	flash@0 {
-		compatible = "spansion,s25fs512s", "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <40000000>;
-		spi-rx-bus-width = <4>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			boot@0 {
-				reg = <0x0 0x1200000>;
-				read-only;
-			};
-			user@1200000 {
-				reg = <0x1200000 0x2e00000>;
-			};
-		};
-	};
-};
-
-&rwdt {
-	timeout-sec = <60>;
-	status = "okay";
-};
-
-&scif_clk {
-	clock-frequency = <24000000>;
 };
arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi renamed from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +12 -12
similarity index 97%
copy from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi
copy to arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi
index 4dcbe50fabb6f0db..8ac17370ff3661c2 100644
@@ -1,20 +1,16 @@
 // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 /*
- * Device Tree Source for the R-Car V4H White Hawk CPU board
+ * Device Tree Source for the common parts shared by the White Hawk CPU and
+ * White Hawk Single boards
  *
  * Copyright (C) 2022 Renesas Electronics Corp.
  */
 
-#include "r8a779g0.dtsi"
-
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
 
 / {
-	model = "Renesas White Hawk CPU board";
-	compatible = "renesas,white-hawk-cpu", "renesas,r8a779g0";
-
 	aliases {
 		ethernet0 = &avb0;
 		serial0 = &hscif0;
@@ -25,6 +21,12 @@ chosen {
 		stdout-path = "serial0:921600n8";
 	};
 
+	sn65dsi86_refclk: clk-x6 {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <38400000>;
+	};
+
 	keys {
 		compatible = "gpio-keys";
 
@@ -135,12 +137,6 @@ reg_3p3v: regulator-3p3v {
 		regulator-boot-on;
 		regulator-always-on;
 	};
-
-	sn65dsi86_refclk: clk-x6 {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <38400000>;
-	};
 };
 
 &avb0 {
@@ -187,6 +183,9 @@ &extalr_clk {
 };
 
 &hscif0 {
+	pinctrl-0 = <&hscif0_pins>;
+	pinctrl-names = "default";
+
 	status = "okay";
 };
 
@@ -300,6 +299,7 @@ pins_mii {
 		};
 
 	};
+
 	hscif0_pins: hscif0 {
 		groups = "hscif0_data";
 		function = "hscif0";
Signature · 1 line
2.34.1
#10 lore raw

Re: [PATCH/RFC 5/7] arm64: dts: renesas: r8a779g0: white-hawk-cpu: Factor out common parts

Quoted 9 lines · Geert Uytterhoeven

Factor out the parts on the White Hawk CPU board that are also present on the White Hawk Single board, so they can be reused when introducing support for the latter.

arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi &extalr_clk { · line 188

Quoted 6 lines
arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi renamed from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +3 -0
@@ -187,6 +183,9 @@ &extalr_clk {
 };
 
 &hscif0 {
+       pinctrl-0 = <&hscif0_pins>;
+       pinctrl-names = "default";
+

Oops, this was intended to be spun off as a separate fix.

arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi &extalr_clk { · line 191

Quoted 3 lines
arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi renamed from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +0 -0
        status = "okay";
 };
 

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
#11 lore raw

Re: [PATCH/RFC 5/7] arm64: dts: renesas: r8a779g0: white-hawk-cpu: Factor out common parts

In reply to Geert Uytterhoeven
Quoted 14 lines
arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi renamed from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +6 -0
@@ -25,6 +21,12 @@ chosen {
 		stdout-path = "serial0:921600n8";
 	};
 
+	sn65dsi86_refclk: clk-x6 {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <38400000>;
+	};
+
 	keys {
 		compatible = "gpio-keys";
 

arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi reg_3p3v: regulator-3p3v { · line 143

Quoted 9 lines
arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi renamed from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +0 -6
@@ -135,12 +137,6 @@ reg_3p3v: regulator-3p3v {
 		regulator-boot-on;
 		regulator-always-on;
 	};
-
-	sn65dsi86_refclk: clk-x6 {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <38400000>;
-	};

Why was this moved?

#12 lore raw

Re: [PATCH/RFC 5/7] arm64: dts: renesas: r8a779g0: white-hawk-cpu: Factor out common parts

Quoted 2 lines

Why was this moved?

Other than that, approach looks good to me.

#13 lore raw

Re: [PATCH/RFC 5/7] arm64: dts: renesas: r8a779g0: white-hawk-cpu: Factor out common parts

In reply to Wolfram Sang

Hi Wolfram,

Quoted 13 lines · Wolfram Sang
Quoted 13 lines
arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi renamed from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +6 -0
@@ -25,6 +21,12 @@ chosen {
              stdout-path = "serial0:921600n8";
      };
 
+     sn65dsi86_refclk: clk-x6 {
+             compatible = "fixed-clock";
+             #clock-cells = <0>;
+             clock-frequency = <38400000>;
+     };
+
      keys {
              compatible = "gpio-keys";
 
Quoted 12 lines

arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi reg_3p3v: regulator-3p3v { · line 143

Quoted 10 lines
arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi renamed from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi +0 -6
@@ -135,12 +137,6 @@ reg_3p3v: regulator-3p3v {
              regulator-boot-on;
              regulator-always-on;
      };
-
-     sn65dsi86_refclk: clk-x6 {
-             compatible = "fixed-clock";
-             #clock-cells = <0>;
-             clock-frequency = <38400000>;
-     };

Why was this moved?

To restore sort order (alphabetical by node name)

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
author maintainer
#14 lore raw

PATCH 6/7 arm64: dts: renesas: r8a779g0: white-hawk: Factor out common parts

In reply to Geert Uytterhoeven

Factor out the parts on the White Hawk BreakOut board that are also present on the White Hawk Single board, so they can be reused when introducing support for the latter.

---
 .../boot/dts/renesas/r8a779g0-white-hawk.dts  | 56 +------------------
 ...-white-hawk.dts => white-hawk-common.dtsi} |  8 +--
 2 files changed, 3 insertions(+), 61 deletions(-)
 copy arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk.dts => white-hawk-common.dtsi} (78%)
arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts +1 -55
index 8d82294a1a56444c..992837e7e7b976b0 100644
@@ -7,63 +7,9 @@
 
 /dts-v1/;
 #include "r8a779g0-white-hawk-cpu.dtsi"
-#include "white-hawk-csi-dsi.dtsi"
-#include "white-hawk-ethernet.dtsi"
+#include "white-hawk-common.dtsi"
 
 / {
 	model = "Renesas White Hawk CPU and Breakout boards based on r8a779g0";
 	compatible = "renesas,white-hawk-breakout", "renesas,white-hawk-cpu", "renesas,r8a779g0";
-
-	can_transceiver0: can-phy0 {
-		compatible = "nxp,tjr1443";
-		#phy-cells = <0>;
-		enable-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
-		max-bitrate = <5000000>;
-	};
-};
-
-&can_clk {
-	clock-frequency = <40000000>;
-};
-
-&canfd {
-	pinctrl-0 = <&canfd0_pins>, <&canfd1_pins>, <&can_clk_pins>;
-	pinctrl-names = "default";
-
-	status = "okay";
-
-	channel0 {
-		status = "okay";
-		phys = <&can_transceiver0>;
-	};
-
-	channel1 {
-		status = "okay";
-	};
-};
-
-&i2c0 {
-	eeprom@51 {
-		compatible = "rohm,br24g01", "atmel,24c01";
-		label = "breakout-board";
-		reg = <0x51>;
-		pagesize = <8>;
-	};
-};
-
-&pfc {
-	can_clk_pins: can-clk {
-		groups = "can_clk";
-		function = "can_clk";
-	};
-
-	canfd0_pins: canfd0 {
-		groups = "canfd0_data";
-		function = "canfd0";
-	};
-
-	canfd1_pins: canfd1 {
-		groups = "canfd1_data";
-		function = "canfd1";
-	};
 };
arch/arm64/boot/dts/renesas/white-hawk-common.dtsi renamed from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts +2 -6
similarity index 78%
copy from arch/arm64/boot/dts/renesas/r8a779g0-white-hawk.dts
copy to arch/arm64/boot/dts/renesas/white-hawk-common.dtsi
index 8d82294a1a56444c..c99086edadcaacdb 100644
@@ -1,19 +1,15 @@
 // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 /*
- * Device Tree Source for the White Hawk CPU and BreakOut boards
+ * Device Tree Source for the common parts shared by the White Hawk BreakOut
+ * and White Hawk Single boards
  *
  * Copyright (C) 2022 Renesas Electronics Corp.
  */
 
-/dts-v1/;
-#include "r8a779g0-white-hawk-cpu.dtsi"
 #include "white-hawk-csi-dsi.dtsi"
 #include "white-hawk-ethernet.dtsi"
 
 / {
-	model = "Renesas White Hawk CPU and Breakout boards based on r8a779g0";
-	compatible = "renesas,white-hawk-breakout", "renesas,white-hawk-cpu", "renesas,r8a779g0";
-
 	can_transceiver0: can-phy0 {
 		compatible = "nxp,tjr1443";
 		#phy-cells = <0>;
Signature · 1 line
2.34.1
author maintainer
#16 lore raw

PATCH 7/7 arm64: dts: renesas: r8a779g0: Add White Hawk Single support

In reply to Geert Uytterhoeven

The White Hawk Single board is a single-board integration of the Renesas White Hawk CPU and Breakout board stack, based on the R-Car V4H ES2.0 (R8A779G2) SoC.

For now, the only visible differences compared to the board stack are:
- The SoC is an updated version of R-Car V4H (R8A779G0),
- The serial console uses an FT2232H instead of a CP2102 USB-UART bridge, with CTS/RTS wired.

---
 arch/arm64/boot/dts/renesas/Makefile          |  2 ++
 .../renesas/r8a779g2-white-hawk-single.dts    | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dts
arch/arm64/boot/dts/renesas/Makefile +2 -0
index 5209ca9cdf8433c1..544dfd8de25cf809 100644
@@ -87,6 +87,8 @@ dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtbo
 r8a779g0-white-hawk-ard-audio-da7212-dtbs := r8a779g0-white-hawk.dtb r8a779g0-white-hawk-ard-audio-da7212.dtbo
 dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtb
 
+dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g2-white-hawk-single.dtb
+
 dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-salvator-xs.dtb
 r8a779m1-salvator-xs-panel-aa104xd12-dtbs := r8a779m1-salvator-xs.dtb salvator-panel-aa104xd12.dtbo
 dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-salvator-xs-panel-aa104xd12.dtb
arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dts new file +28 -0
new file mode 100644
index 0000000000000000..ca5791b3ca321e97
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/*
+ * Device Tree Source for the White Hawk Single board
+ *
+ * Copyright (C) 2023 Glider bv
+ */
+
+/dts-v1/;
+#include "r8a779g2.dtsi"
+#include "white-hawk-cpu-common.dtsi"
+#include "white-hawk-common.dtsi"
+
+/ {
+	model = "Renesas White Hawk Single board based on r8a779g2";
+	compatible = "renesas,white-hawk-single", "renesas,r8a779g2",
+		     "renesas,r8a779g0";
+};
+
+&hscif0 {
+	uart-has-rtscts;
+};
+
+&pfc {
+	hscif0_pins: hscif0 {
+		groups = "hscif0_data", "hscif0_ctrl";
+		function = "hscif0";
+	};
+};
Signature · 1 line
2.34.1
#17 lore raw

Re: [PATCH/RFC 7/7] arm64: dts: renesas: r8a779g0: Add White Hawk Single support

Quoted 13 lines · Geert Uytterhoeven

The White Hawk Single board is a single-board integration of the Renesas White Hawk CPU and Breakout board stack, based on the R-Car V4H ES2.0 (R8A779G2) SoC.

For now, the only visible differences compared to the board stack are:
- The SoC is an updated version of R-Car V4H (R8A779G0),
- The serial console uses an FT2232H instead of a CP2102 USB-UART bridge, with CTS/RTS wired.

arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dts line 24

Quoted 4 lines
arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dts new file +3 -0
 
+
+&pfc {
+       hscif0_pins: hscif0 {

&hscif0_pins {

arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dts line 28

Quoted 4 lines
arch/arm64/boot/dts/renesas/r8a779g2-white-hawk-single.dts new file +4 -0
+               groups = "hscif0_data", "hscif0_ctrl";
+               function = "hscif0";
+       };
+};

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
Reviewed-by on v1 7/7
#18 lore raw

Re: [PATCH/RFC 7/7] arm64: dts: renesas: r8a779g0: Add White Hawk Single support

In reply to Geert Uytterhoeven
Quoted 10 lines · Geert Uytterhoeven

The White Hawk Single board is a single-board integration of the Renesas White Hawk CPU and Breakout board stack, based on the R-Car V4H ES2.0 (R8A779G2) SoC.

For now, the only visible differences compared to the board stack are:
- The SoC is an updated version of R-Car V4H (R8A779G0),
- The serial console uses an FT2232H instead of a CP2102 USB-UART bridge, with CTS/RTS wired.

Modulo the HSCIF pin issue:

I like the split up and the naming. Makes sense to me.

Quoted 2 lines

+/*
+ * Device Tree Source for the White Hawk Single board

Maybe add "R-Car V4H" here? Maybe even "Rev 2.0"?

Quoted 3 lines

+ *
+ * Copyright (C) 2023 Glider bv
+ */

#19 lore raw

Re: [PATCH/RFC 7/7] arm64: dts: renesas: r8a779g0: Add White Hawk Single support

Hi Wolfram,

Quoted 10 lines · Wolfram Sang
Quoted 9 lines · Geert Uytterhoeven

The White Hawk Single board is a single-board integration of the Renesas White Hawk CPU and Breakout board stack, based on the R-Car V4H ES2.0 (R8A779G2) SoC.

For now, the only visible differences compared to the board stack are:
- The SoC is an updated version of R-Car V4H (R8A779G0),
- The serial console uses an FT2232H instead of a CP2102 USB-UART bridge, with CTS/RTS wired.

Quoted 7 lines
Quoted 1 line

Modulo the HSCIF pin issue:

I like the split up and the naming. Makes sense to me.

Thanks!

Quoted 4 lines
Quoted 2 lines

+/*
+ * Device Tree Source for the White Hawk Single board

Maybe add "R-Car V4H" here? Maybe even "Rev 2.0"?

The existing r8a779g0-white-hawk.dts does not have such a comment. Perhaps it should be added, too?

Gr{oetje,eeting}s,

Geert

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
#20 lore raw

Re: [PATCH/RFC 7/7] arm64: dts: renesas: r8a779g0: Add White Hawk Single support

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

+/*
+ * Device Tree Source for the White Hawk Single board

Maybe add "R-Car V4H" here? Maybe even "Rev 2.0"?

The existing r8a779g0-white-hawk.dts does not have such a comment. Perhaps it should be added, too?

I think so. I mean, the whole point of the series is to make white-hawk includes independent. I'd conclude that the actual users of the includes should specify which SoC this instance incorporates.