linux-renesas-soc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC
@ 2023-01-31 22:35 Prabhakar
  2023-01-31 22:35 ` [PATCH v2 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET Prabhakar
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Prabhakar @ 2023-01-31 22:35 UTC (permalink / raw)
  To: Geert Uytterhoeven, Magnus Damm
  Cc: Rob Herring, Krzysztof Kozlowski, linux-renesas-soc, devicetree,
	linux-kernel, Prabhakar, Biju Das, Lad Prabhakar

From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

Hi All,

This series aims to reuse RZ/G2L SoC DTSI with RZ/V2L as both the SoCs are
almost identical.

v1 -> v2
* Patch 1/2 unchanged, for patch 2/2 sorted the nodes based on the names.

v1: https://patchwork.kernel.org/project/linux-renesas-soc/cover/20230127133909.144774-1-prabhakar.mahadev-lad.rj@bp.renesas.com/

Cheers,
Prabhakar

Lad Prabhakar (2):
  arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and
    RESET
  arm64: dts: renesas: r9a07g054: Reuse RZ/G2L SoC DTSI

 arch/arm64/boot/dts/renesas/r9a07g044.dtsi |  254 ++---
 arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 1149 +++-----------------
 2 files changed, 256 insertions(+), 1147 deletions(-)

-- 
2.25.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v2 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET
  2023-01-31 22:35 [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC Prabhakar
@ 2023-01-31 22:35 ` Prabhakar
  2023-02-13 14:09   ` Geert Uytterhoeven
  2023-03-08 12:56   ` Krzysztof Kozlowski
  2023-01-31 22:35 ` [PATCH v2 2/2] arm64: dts: renesas: r9a07g054: Reuse RZ/G2L SoC DTSI Prabhakar
  2023-02-13 14:16 ` [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC Geert Uytterhoeven
  2 siblings, 2 replies; 10+ messages in thread
From: Prabhakar @ 2023-01-31 22:35 UTC (permalink / raw)
  To: Geert Uytterhoeven, Magnus Damm
  Cc: Rob Herring, Krzysztof Kozlowski, linux-renesas-soc, devicetree,
	linux-kernel, Prabhakar, Biju Das, Lad Prabhakar

From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

Use a SoC specific macro for CPG and RESET so that we can re-use the
RZ/G2L SoC DTSI for RZ/V2L SoC by just updating the SoC specific macro.

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
v1->v2
* No change
---
 arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 254 +++++++++++----------
 1 file changed, 129 insertions(+), 125 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r9a07g044.dtsi b/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
index 487536696d90..80b2332798d9 100644
--- a/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
+++ b/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
@@ -1,12 +1,16 @@
 // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 /*
- * Device Tree Source for the RZ/G2L and RZ/G2LC common SoC parts
+ * Device Tree Source for the RZ/G2L, RZ/G2LC and RZ/V2L common SoC parts
  *
  * Copyright (C) 2021 Renesas Electronics Corp.
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+#ifndef SOC_CPG_PREFIX
 #include <dt-bindings/clock/r9a07g044-cpg.h>
+#define SOC_CPG_PREFIX(X)	R9A07G044_ ## X
+#endif
 
 / {
 	compatible = "renesas,r9a07g044";
@@ -91,7 +95,7 @@ cpu0: cpu@0 {
 			#cooling-cells = <2>;
 			next-level-cache = <&L3_CA55>;
 			enable-method = "psci";
-			clocks = <&cpg CPG_CORE R9A07G044_CLK_I>;
+			clocks = <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_I)>;
 			operating-points-v2 = <&cluster0_opp>;
 		};
 
@@ -101,7 +105,7 @@ cpu1: cpu@100 {
 			device_type = "cpu";
 			next-level-cache = <&L3_CA55>;
 			enable-method = "psci";
-			clocks = <&cpg CPG_CORE R9A07G044_CLK_I>;
+			clocks = <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_I)>;
 			operating-points-v2 = <&cluster0_opp>;
 		};
 
@@ -178,11 +182,11 @@ ssi0: ssi@10049c00 {
 				     <GIC_SPI 328 IRQ_TYPE_EDGE_RISING>,
 				     <GIC_SPI 329 IRQ_TYPE_EDGE_RISING>;
 			interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt";
-			clocks = <&cpg CPG_MOD R9A07G044_SSI0_PCLK2>,
-				 <&cpg CPG_MOD R9A07G044_SSI0_PCLK_SFR>,
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SSI0_PCLK2)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SSI0_PCLK_SFR)>,
 				 <&audio_clk1>, <&audio_clk2>;
 			clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2";
-			resets = <&cpg R9A07G044_SSI0_RST_M2_REG>;
+			resets = <&cpg SOC_CPG_PREFIX(SSI0_RST_M2_REG)>;
 			dmas = <&dmac 0x2655>, <&dmac 0x2656>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -199,11 +203,11 @@ ssi1: ssi@1004a000 {
 				     <GIC_SPI 332 IRQ_TYPE_EDGE_RISING>,
 				     <GIC_SPI 333 IRQ_TYPE_EDGE_RISING>;
 			interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt";
-			clocks = <&cpg CPG_MOD R9A07G044_SSI1_PCLK2>,
-				 <&cpg CPG_MOD R9A07G044_SSI1_PCLK_SFR>,
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SSI1_PCLK2)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SSI1_PCLK_SFR)>,
 				 <&audio_clk1>, <&audio_clk2>;
 			clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2";
-			resets = <&cpg R9A07G044_SSI1_RST_M2_REG>;
+			resets = <&cpg SOC_CPG_PREFIX(SSI1_RST_M2_REG)>;
 			dmas = <&dmac 0x2659>, <&dmac 0x265a>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -220,11 +224,11 @@ ssi2: ssi@1004a400 {
 				     <GIC_SPI 336 IRQ_TYPE_EDGE_RISING>,
 				     <GIC_SPI 337 IRQ_TYPE_EDGE_RISING>;
 			interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt";
-			clocks = <&cpg CPG_MOD R9A07G044_SSI2_PCLK2>,
-				 <&cpg CPG_MOD R9A07G044_SSI2_PCLK_SFR>,
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SSI2_PCLK2)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SSI2_PCLK_SFR)>,
 				 <&audio_clk1>, <&audio_clk2>;
 			clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2";
-			resets = <&cpg R9A07G044_SSI2_RST_M2_REG>;
+			resets = <&cpg SOC_CPG_PREFIX(SSI2_RST_M2_REG)>;
 			dmas = <&dmac 0x265f>;
 			dma-names = "rt";
 			power-domains = <&cpg>;
@@ -241,11 +245,11 @@ ssi3: ssi@1004a800 {
 				     <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>,
 				     <GIC_SPI 341 IRQ_TYPE_EDGE_RISING>;
 			interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt";
-			clocks = <&cpg CPG_MOD R9A07G044_SSI3_PCLK2>,
-				 <&cpg CPG_MOD R9A07G044_SSI3_PCLK_SFR>,
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SSI3_PCLK2)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SSI3_PCLK_SFR)>,
 				 <&audio_clk1>, <&audio_clk2>;
 			clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2";
-			resets = <&cpg R9A07G044_SSI3_RST_M2_REG>;
+			resets = <&cpg SOC_CPG_PREFIX(SSI3_RST_M2_REG)>;
 			dmas = <&dmac 0x2661>, <&dmac 0x2662>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -260,8 +264,8 @@ spi0: spi@1004ac00 {
 				     <GIC_SPI 413 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "error", "rx", "tx";
-			clocks = <&cpg CPG_MOD R9A07G044_RSPI0_CLKB>;
-			resets = <&cpg R9A07G044_RSPI0_RST>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(RSPI0_CLKB)>;
+			resets = <&cpg SOC_CPG_PREFIX(RSPI0_RST)>;
 			dmas = <&dmac 0x2e95>, <&dmac 0x2e96>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -278,8 +282,8 @@ spi1: spi@1004b000 {
 				     <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "error", "rx", "tx";
-			clocks = <&cpg CPG_MOD R9A07G044_RSPI1_CLKB>;
-			resets = <&cpg R9A07G044_RSPI1_RST>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(RSPI1_CLKB)>;
+			resets = <&cpg SOC_CPG_PREFIX(RSPI1_RST)>;
 			dmas = <&dmac 0x2e99>, <&dmac 0x2e9a>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -296,8 +300,8 @@ spi2: spi@1004b400 {
 				     <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "error", "rx", "tx";
-			clocks = <&cpg CPG_MOD R9A07G044_RSPI2_CLKB>;
-			resets = <&cpg R9A07G044_RSPI2_RST>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(RSPI2_CLKB)>;
+			resets = <&cpg SOC_CPG_PREFIX(RSPI2_RST)>;
 			dmas = <&dmac 0x2e9d>, <&dmac 0x2e9e>;
 			dma-names = "tx", "rx";
 			power-domains = <&cpg>;
@@ -318,10 +322,10 @@ scif0: serial@1004b800 {
 				     <GIC_SPI 384 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "eri", "rxi", "txi",
 					  "bri", "dri", "tei";
-			clocks = <&cpg CPG_MOD R9A07G044_SCIF0_CLK_PCK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCIF0_CLK_PCK)>;
 			clock-names = "fck";
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_SCIF0_RST_SYSTEM_N>;
+			resets = <&cpg SOC_CPG_PREFIX(SCIF0_RST_SYSTEM_N)>;
 			status = "disabled";
 		};
 
@@ -336,10 +340,10 @@ scif1: serial@1004bc00 {
 				     <GIC_SPI 389 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "eri", "rxi", "txi",
 					  "bri", "dri", "tei";
-			clocks = <&cpg CPG_MOD R9A07G044_SCIF1_CLK_PCK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCIF1_CLK_PCK)>;
 			clock-names = "fck";
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_SCIF1_RST_SYSTEM_N>;
+			resets = <&cpg SOC_CPG_PREFIX(SCIF1_RST_SYSTEM_N)>;
 			status = "disabled";
 		};
 
@@ -354,10 +358,10 @@ scif2: serial@1004c000 {
 				     <GIC_SPI 394 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "eri", "rxi", "txi",
 					  "bri", "dri", "tei";
-			clocks = <&cpg CPG_MOD R9A07G044_SCIF2_CLK_PCK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCIF2_CLK_PCK)>;
 			clock-names = "fck";
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_SCIF2_RST_SYSTEM_N>;
+			resets = <&cpg SOC_CPG_PREFIX(SCIF2_RST_SYSTEM_N)>;
 			status = "disabled";
 		};
 
@@ -372,10 +376,10 @@ scif3: serial@1004c400 {
 				     <GIC_SPI 399 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "eri", "rxi", "txi",
 					  "bri", "dri", "tei";
-			clocks = <&cpg CPG_MOD R9A07G044_SCIF3_CLK_PCK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCIF3_CLK_PCK)>;
 			clock-names = "fck";
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_SCIF3_RST_SYSTEM_N>;
+			resets = <&cpg SOC_CPG_PREFIX(SCIF3_RST_SYSTEM_N)>;
 			status = "disabled";
 		};
 
@@ -390,10 +394,10 @@ scif4: serial@1004c800 {
 				     <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "eri", "rxi", "txi",
 					  "bri", "dri", "tei";
-			clocks = <&cpg CPG_MOD R9A07G044_SCIF4_CLK_PCK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCIF4_CLK_PCK)>;
 			clock-names = "fck";
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_SCIF4_RST_SYSTEM_N>;
+			resets = <&cpg SOC_CPG_PREFIX(SCIF4_RST_SYSTEM_N)>;
 			status = "disabled";
 		};
 
@@ -405,10 +409,10 @@ sci0: serial@1004d000 {
 				     <GIC_SPI 407 IRQ_TYPE_EDGE_RISING>,
 				     <GIC_SPI 408 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "eri", "rxi", "txi", "tei";
-			clocks = <&cpg CPG_MOD R9A07G044_SCI0_CLKP>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCI0_CLKP)>;
 			clock-names = "fck";
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_SCI0_RST>;
+			resets = <&cpg SOC_CPG_PREFIX(SCI0_RST)>;
 			status = "disabled";
 		};
 
@@ -420,10 +424,10 @@ sci1: serial@1004d400 {
 				     <GIC_SPI 411 IRQ_TYPE_EDGE_RISING>,
 				     <GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "eri", "rxi", "txi", "tei";
-			clocks = <&cpg CPG_MOD R9A07G044_SCI1_CLKP>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SCI1_CLKP)>;
 			clock-names = "fck";
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_SCI1_RST>;
+			resets = <&cpg SOC_CPG_PREFIX(SCI1_RST)>;
 			status = "disabled";
 		};
 
@@ -441,14 +445,14 @@ canfd: can@10050000 {
 			interrupt-names = "g_err", "g_recc",
 					  "ch0_err", "ch0_rec", "ch0_trx",
 					  "ch1_err", "ch1_rec", "ch1_trx";
-			clocks = <&cpg CPG_MOD R9A07G044_CANFD_PCLK>,
-				 <&cpg CPG_CORE R9A07G044_CLK_P0_DIV2>,
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(CANFD_PCLK)>,
+				 <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_P0_DIV2)>,
 				 <&can_clk>;
 			clock-names = "fck", "canfd", "can_clk";
-			assigned-clocks = <&cpg CPG_CORE R9A07G044_CLK_P0_DIV2>;
+			assigned-clocks = <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_P0_DIV2)>;
 			assigned-clock-rates = <50000000>;
-			resets = <&cpg R9A07G044_CANFD_RSTP_N>,
-				 <&cpg R9A07G044_CANFD_RSTC_N>;
+			resets = <&cpg SOC_CPG_PREFIX(CANFD_RSTP_N)>,
+				 <&cpg SOC_CPG_PREFIX(CANFD_RSTC_N)>;
 			reset-names = "rstp_n", "rstc_n";
 			power-domains = <&cpg>;
 			status = "disabled";
@@ -476,9 +480,9 @@ i2c0: i2c@10058000 {
 				     <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "tei", "ri", "ti", "spi", "sti",
 					  "naki", "ali", "tmoi";
-			clocks = <&cpg CPG_MOD R9A07G044_I2C0_PCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(I2C0_PCLK)>;
 			clock-frequency = <100000>;
-			resets = <&cpg R9A07G044_I2C0_MRST>;
+			resets = <&cpg SOC_CPG_PREFIX(I2C0_MRST)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
@@ -498,9 +502,9 @@ i2c1: i2c@10058400 {
 				     <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "tei", "ri", "ti", "spi", "sti",
 					  "naki", "ali", "tmoi";
-			clocks = <&cpg CPG_MOD R9A07G044_I2C1_PCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(I2C1_PCLK)>;
 			clock-frequency = <100000>;
-			resets = <&cpg R9A07G044_I2C1_MRST>;
+			resets = <&cpg SOC_CPG_PREFIX(I2C1_MRST)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
@@ -520,9 +524,9 @@ i2c2: i2c@10058800 {
 				     <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "tei", "ri", "ti", "spi", "sti",
 					  "naki", "ali", "tmoi";
-			clocks = <&cpg CPG_MOD R9A07G044_I2C2_PCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(I2C2_PCLK)>;
 			clock-frequency = <100000>;
-			resets = <&cpg R9A07G044_I2C2_MRST>;
+			resets = <&cpg SOC_CPG_PREFIX(I2C2_MRST)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
@@ -542,9 +546,9 @@ i2c3: i2c@10058c00 {
 				     <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "tei", "ri", "ti", "spi", "sti",
 					  "naki", "ali", "tmoi";
-			clocks = <&cpg CPG_MOD R9A07G044_I2C3_PCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(I2C3_PCLK)>;
 			clock-frequency = <100000>;
-			resets = <&cpg R9A07G044_I2C3_MRST>;
+			resets = <&cpg SOC_CPG_PREFIX(I2C3_MRST)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
@@ -553,11 +557,11 @@ adc: adc@10059000 {
 			compatible = "renesas,r9a07g044-adc", "renesas,rzg2l-adc";
 			reg = <0 0x10059000 0 0x400>;
 			interrupts = <GIC_SPI 347 IRQ_TYPE_EDGE_RISING>;
-			clocks = <&cpg CPG_MOD R9A07G044_ADC_ADCLK>,
-				 <&cpg CPG_MOD R9A07G044_ADC_PCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(ADC_ADCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(ADC_PCLK)>;
 			clock-names = "adclk", "pclk";
-			resets = <&cpg R9A07G044_ADC_PRESETN>,
-				 <&cpg R9A07G044_ADC_ADRST_N>;
+			resets = <&cpg SOC_CPG_PREFIX(ADC_PRESETN)>,
+				 <&cpg SOC_CPG_PREFIX(ADC_ADRST_N)>;
 			reset-names = "presetn", "adrst-n";
 			power-domains = <&cpg>;
 			status = "disabled";
@@ -595,8 +599,8 @@ tsu: thermal@10059400 {
 			compatible = "renesas,r9a07g044-tsu",
 				     "renesas,rzg2l-tsu";
 			reg = <0 0x10059400 0 0x400>;
-			clocks = <&cpg CPG_MOD R9A07G044_TSU_PCLK>;
-			resets = <&cpg R9A07G044_TSU_PRESETN>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(TSU_PCLK)>;
+			resets = <&cpg SOC_CPG_PREFIX(TSU_PRESETN)>;
 			power-domains = <&cpg>;
 			#thermal-sensor-cells = <1>;
 		};
@@ -609,9 +613,9 @@ sbc: spi@10060000 {
 			      <0 0x10070000 0 0x10000>;
 			reg-names = "regs", "dirmap", "wbuf";
 			interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_SPI_CLK2>,
-				 <&cpg CPG_MOD R9A07G044_SPI_CLK>;
-			resets = <&cpg R9A07G044_SPI_RST>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SPI_CLK2)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SPI_CLK)>;
+			resets = <&cpg SOC_CPG_PREFIX(SPI_RST)>;
 			power-domains = <&cpg>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -649,11 +653,11 @@ pinctrl: pinctrl@11030000 {
 			interrupt-parent = <&irqc>;
 			interrupt-controller;
 			gpio-ranges = <&pinctrl 0 0 392>;
-			clocks = <&cpg CPG_MOD R9A07G044_GPIO_HCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(GPIO_HCLK)>;
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_GPIO_RSTN>,
-				 <&cpg R9A07G044_GPIO_PORT_RESETN>,
-				 <&cpg R9A07G044_GPIO_SPARE_RESETN>;
+			resets = <&cpg SOC_CPG_PREFIX(GPIO_RSTN)>,
+				 <&cpg SOC_CPG_PREFIX(GPIO_PORT_RESETN)>,
+				 <&cpg SOC_CPG_PREFIX(GPIO_SPARE_RESETN)>;
 		};
 
 		irqc: interrupt-controller@110a0000 {
@@ -704,11 +708,11 @@ irqc: interrupt-controller@110a0000 {
 				     <GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 475 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_IA55_CLK>,
-				 <&cpg CPG_MOD R9A07G044_IA55_PCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(IA55_CLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(IA55_PCLK)>;
 			clock-names = "clk", "pclk";
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_IA55_RESETN>;
+			resets = <&cpg SOC_CPG_PREFIX(IA55_RESETN)>;
 		};
 
 		dmac: dma-controller@11820000 {
@@ -738,11 +742,11 @@ dmac: dma-controller@11820000 {
 					  "ch4", "ch5", "ch6", "ch7",
 					  "ch8", "ch9", "ch10", "ch11",
 					  "ch12", "ch13", "ch14", "ch15";
-			clocks = <&cpg CPG_MOD R9A07G044_DMAC_ACLK>,
-				 <&cpg CPG_MOD R9A07G044_DMAC_PCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(DMAC_ACLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(DMAC_PCLK)>;
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_DMAC_ARESETN>,
-				 <&cpg R9A07G044_DMAC_RST_ASYNC>;
+			resets = <&cpg SOC_CPG_PREFIX(DMAC_ARESETN)>,
+				 <&cpg SOC_CPG_PREFIX(DMAC_RST_ASYNC)>;
 			#dma-cells = <1>;
 			dma-channels = <16>;
 		};
@@ -756,14 +760,14 @@ gpu: gpu@11840000 {
 				     <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "job", "mmu", "gpu", "event";
-			clocks = <&cpg CPG_MOD R9A07G044_GPU_CLK>,
-				 <&cpg CPG_MOD R9A07G044_GPU_AXI_CLK>,
-				 <&cpg CPG_MOD R9A07G044_GPU_ACE_CLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(GPU_CLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(GPU_AXI_CLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(GPU_ACE_CLK)>;
 			clock-names = "gpu", "bus", "bus_ace";
 			power-domains = <&cpg>;
-			resets = <&cpg R9A07G044_GPU_RESETN>,
-				 <&cpg R9A07G044_GPU_AXI_RESETN>,
-				 <&cpg R9A07G044_GPU_ACE_RESETN>;
+			resets = <&cpg SOC_CPG_PREFIX(GPU_RESETN)>,
+				 <&cpg SOC_CPG_PREFIX(GPU_AXI_RESETN)>,
+				 <&cpg SOC_CPG_PREFIX(GPU_ACE_RESETN)>;
 			reset-names = "rst", "axi_rst", "ace_rst";
 			operating-points-v2 = <&gpu_opp_table>;
 		};
@@ -784,12 +788,12 @@ sdhi0: mmc@11c00000 {
 			reg = <0x0 0x11c00000 0 0x10000>;
 			interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_SDHI0_IMCLK>,
-				 <&cpg CPG_MOD R9A07G044_SDHI0_CLK_HS>,
-				 <&cpg CPG_MOD R9A07G044_SDHI0_IMCLK2>,
-				 <&cpg CPG_MOD R9A07G044_SDHI0_ACLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI0_IMCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI0_CLK_HS)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI0_IMCLK2)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI0_ACLK)>;
 			clock-names = "core", "clkh", "cd", "aclk";
-			resets = <&cpg R9A07G044_SDHI0_IXRST>;
+			resets = <&cpg SOC_CPG_PREFIX(SDHI0_IXRST)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
@@ -800,12 +804,12 @@ sdhi1: mmc@11c10000 {
 			reg = <0x0 0x11c10000 0 0x10000>;
 			interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_SDHI1_IMCLK>,
-				 <&cpg CPG_MOD R9A07G044_SDHI1_CLK_HS>,
-				 <&cpg CPG_MOD R9A07G044_SDHI1_IMCLK2>,
-				 <&cpg CPG_MOD R9A07G044_SDHI1_ACLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI1_IMCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI1_CLK_HS)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI1_IMCLK2)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(SDHI1_ACLK)>;
 			clock-names = "core", "clkh", "cd", "aclk";
-			resets = <&cpg R9A07G044_SDHI1_IXRST>;
+			resets = <&cpg SOC_CPG_PREFIX(SDHI1_IXRST)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
@@ -819,11 +823,11 @@ eth0: ethernet@11c20000 {
 				     <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "mux", "fil", "arp_ns";
 			phy-mode = "rgmii";
-			clocks = <&cpg CPG_MOD R9A07G044_ETH0_CLK_AXI>,
-				 <&cpg CPG_MOD R9A07G044_ETH0_CLK_CHI>,
-				 <&cpg CPG_CORE R9A07G044_CLK_HP>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(ETH0_CLK_AXI)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(ETH0_CLK_CHI)>,
+				 <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_HP>);
 			clock-names = "axi", "chi", "refclk";
-			resets = <&cpg R9A07G044_ETH0_RST_HW_N>;
+			resets = <&cpg SOC_CPG_PREFIX(ETH0_RST_HW_N)>;
 			power-domains = <&cpg>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -839,11 +843,11 @@ eth1: ethernet@11c30000 {
 				     <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "mux", "fil", "arp_ns";
 			phy-mode = "rgmii";
-			clocks = <&cpg CPG_MOD R9A07G044_ETH1_CLK_AXI>,
-				 <&cpg CPG_MOD R9A07G044_ETH1_CLK_CHI>,
-				 <&cpg CPG_CORE R9A07G044_CLK_HP>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(ETH1_CLK_AXI)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(ETH1_CLK_CHI)>,
+				 <&cpg CPG_CORE SOC_CPG_PREFIX(CLK_HP)>;
 			clock-names = "axi", "chi", "refclk";
-			resets = <&cpg R9A07G044_ETH1_RST_HW_N>;
+			resets = <&cpg SOC_CPG_PREFIX(ETH1_RST_HW_N)>;
 			power-domains = <&cpg>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -854,8 +858,8 @@ phyrst: usbphy-ctrl@11c40000 {
 			compatible = "renesas,r9a07g044-usbphy-ctrl",
 				     "renesas,rzg2l-usbphy-ctrl";
 			reg = <0 0x11c40000 0 0x10000>;
-			clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>;
-			resets = <&cpg R9A07G044_USB_PRESETN>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>;
+			resets = <&cpg SOC_CPG_PREFIX(USB_PRESETN)>;
 			power-domains = <&cpg>;
 			#reset-cells = <1>;
 			status = "disabled";
@@ -865,10 +869,10 @@ ohci0: usb@11c50000 {
 			compatible = "generic-ohci";
 			reg = <0 0x11c50000 0 0x100>;
 			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G044_USB_U2H0_HCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H0_HCLK)>;
 			resets = <&phyrst 0>,
-				 <&cpg R9A07G044_USB_U2H0_HRESETN>;
+				 <&cpg SOC_CPG_PREFIX(USB_U2H0_HRESETN)>;
 			phys = <&usb2_phy0 1>;
 			phy-names = "usb";
 			power-domains = <&cpg>;
@@ -879,10 +883,10 @@ ohci1: usb@11c70000 {
 			compatible = "generic-ohci";
 			reg = <0 0x11c70000 0 0x100>;
 			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G044_USB_U2H1_HCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H1_HCLK)>;
 			resets = <&phyrst 1>,
-				 <&cpg R9A07G044_USB_U2H1_HRESETN>;
+				 <&cpg SOC_CPG_PREFIX(USB_U2H1_HRESETN)>;
 			phys = <&usb2_phy1 1>;
 			phy-names = "usb";
 			power-domains = <&cpg>;
@@ -893,10 +897,10 @@ ehci0: usb@11c50100 {
 			compatible = "generic-ehci";
 			reg = <0 0x11c50100 0 0x100>;
 			interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G044_USB_U2H0_HCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H0_HCLK)>;
 			resets = <&phyrst 0>,
-				 <&cpg R9A07G044_USB_U2H0_HRESETN>;
+				 <&cpg SOC_CPG_PREFIX(USB_U2H0_HRESETN)>;
 			phys = <&usb2_phy0 2>;
 			phy-names = "usb";
 			companion = <&ohci0>;
@@ -908,10 +912,10 @@ ehci1: usb@11c70100 {
 			compatible = "generic-ehci";
 			reg = <0 0x11c70100 0 0x100>;
 			interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G044_USB_U2H1_HCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H1_HCLK)>;
 			resets = <&phyrst 1>,
-				 <&cpg R9A07G044_USB_U2H1_HRESETN>;
+				 <&cpg SOC_CPG_PREFIX(USB_U2H1_HRESETN)>;
 			phys = <&usb2_phy1 2>;
 			phy-names = "usb";
 			companion = <&ohci1>;
@@ -924,8 +928,8 @@ usb2_phy0: usb-phy@11c50200 {
 				     "renesas,rzg2l-usb2-phy";
 			reg = <0 0x11c50200 0 0x700>;
 			interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G044_USB_U2H0_HCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H0_HCLK)>;
 			resets = <&phyrst 0>;
 			#phy-cells = <1>;
 			power-domains = <&cpg>;
@@ -937,8 +941,8 @@ usb2_phy1: usb-phy@11c70200 {
 				     "renesas,rzg2l-usb2-phy";
 			reg = <0 0x11c70200 0 0x700>;
 			interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G044_USB_U2H1_HCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2H1_HCLK)>;
 			resets = <&phyrst 1>;
 			#phy-cells = <1>;
 			power-domains = <&cpg>;
@@ -953,10 +957,10 @@ hsusb: usb@11c60000 {
 				     <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G044_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G044_USB_U2P_EXR_CPUCLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(USB_PCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(USB_U2P_EXR_CPUCLK)>;
 			resets = <&phyrst 0>,
-				 <&cpg R9A07G044_USB_U2P_EXL_SYSRST>;
+				 <&cpg SOC_CPG_PREFIX(USB_U2P_EXL_SYSRST)>;
 			renesas,buswait = <7>;
 			phys = <&usb2_phy0 3>;
 			phy-names = "usb";
@@ -968,13 +972,13 @@ wdt0: watchdog@12800800 {
 			compatible = "renesas,r9a07g044-wdt",
 				     "renesas,rzg2l-wdt";
 			reg = <0 0x12800800 0 0x400>;
-			clocks = <&cpg CPG_MOD R9A07G044_WDT0_PCLK>,
-				 <&cpg CPG_MOD R9A07G044_WDT0_CLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(WDT0_PCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(WDT0_CLK)>;
 			clock-names = "pclk", "oscclk";
 			interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "wdt", "perrout";
-			resets = <&cpg R9A07G044_WDT0_PRESETN>;
+			resets = <&cpg SOC_CPG_PREFIX(WDT0_PRESETN)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
@@ -983,13 +987,13 @@ wdt1: watchdog@12800c00 {
 			compatible = "renesas,r9a07g044-wdt",
 				     "renesas,rzg2l-wdt";
 			reg = <0 0x12800C00 0 0x400>;
-			clocks = <&cpg CPG_MOD R9A07G044_WDT1_PCLK>,
-				 <&cpg CPG_MOD R9A07G044_WDT1_CLK>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(WDT1_PCLK)>,
+				 <&cpg CPG_MOD SOC_CPG_PREFIX(WDT1_CLK)>;
 			clock-names = "pclk", "oscclk";
 			interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "wdt", "perrout";
-			resets = <&cpg R9A07G044_WDT1_PRESETN>;
+			resets = <&cpg SOC_CPG_PREFIX(WDT1_PRESETN)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
@@ -999,8 +1003,8 @@ ostm0: timer@12801000 {
 				     "renesas,ostm";
 			reg = <0x0 0x12801000 0x0 0x400>;
 			interrupts = <GIC_SPI 46 IRQ_TYPE_EDGE_RISING>;
-			clocks = <&cpg CPG_MOD R9A07G044_OSTM0_PCLK>;
-			resets = <&cpg R9A07G044_OSTM0_PRESETZ>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(OSTM0_PCLK)>;
+			resets = <&cpg SOC_CPG_PREFIX(OSTM0_PRESETZ)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
@@ -1010,8 +1014,8 @@ ostm1: timer@12801400 {
 				     "renesas,ostm";
 			reg = <0x0 0x12801400 0x0 0x400>;
 			interrupts = <GIC_SPI 47 IRQ_TYPE_EDGE_RISING>;
-			clocks = <&cpg CPG_MOD R9A07G044_OSTM1_PCLK>;
-			resets = <&cpg R9A07G044_OSTM1_PRESETZ>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(OSTM1_PCLK)>;
+			resets = <&cpg SOC_CPG_PREFIX(OSTM1_PRESETZ)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
@@ -1021,8 +1025,8 @@ ostm2: timer@12801800 {
 				     "renesas,ostm";
 			reg = <0x0 0x12801800 0x0 0x400>;
 			interrupts = <GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;
-			clocks = <&cpg CPG_MOD R9A07G044_OSTM2_PCLK>;
-			resets = <&cpg R9A07G044_OSTM2_PRESETZ>;
+			clocks = <&cpg CPG_MOD SOC_CPG_PREFIX(OSTM2_PCLK)>;
+			resets = <&cpg SOC_CPG_PREFIX(OSTM2_PRESETZ)>;
 			power-domains = <&cpg>;
 			status = "disabled";
 		};
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH v2 2/2] arm64: dts: renesas: r9a07g054: Reuse RZ/G2L SoC DTSI
  2023-01-31 22:35 [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC Prabhakar
  2023-01-31 22:35 ` [PATCH v2 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET Prabhakar
@ 2023-01-31 22:35 ` Prabhakar
  2023-02-13 14:10   ` Geert Uytterhoeven
  2023-02-13 14:16 ` [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC Geert Uytterhoeven
  2 siblings, 1 reply; 10+ messages in thread
From: Prabhakar @ 2023-01-31 22:35 UTC (permalink / raw)
  To: Geert Uytterhoeven, Magnus Damm
  Cc: Rob Herring, Krzysztof Kozlowski, linux-renesas-soc, devicetree,
	linux-kernel, Prabhakar, Biju Das, Lad Prabhakar

From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

RZ/V2L SoC is almost identical to RZ/G2L SoC hence re-use the RZ/G2L SoC
DTSI and just update the compatible strings wherever required.

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
v1->v2
* Sorted the nodes based on the names
---
 arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 1149 +++-----------------
 1 file changed, 127 insertions(+), 1022 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r9a07g054.dtsi b/arch/arm64/boot/dts/renesas/r9a07g054.dtsi
index 304ade54425b..818a2273f97f 100644
--- a/arch/arm64/boot/dts/renesas/r9a07g054.dtsi
+++ b/arch/arm64/boot/dts/renesas/r9a07g054.dtsi
@@ -5,1071 +5,176 @@
  * Copyright (C) 2021 Renesas Electronics Corp.
  */
 
-#include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/r9a07g054-cpg.h>
 
-/ {
-	compatible = "renesas,r9a07g054";
-	#address-cells = <2>;
-	#size-cells = <2>;
-
-	audio_clk1: audio1-clk {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		/* This value must be overridden by boards that provide it */
-		clock-frequency = <0>;
-	};
-
-	audio_clk2: audio2-clk {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		/* This value must be overridden by boards that provide it */
-		clock-frequency = <0>;
-	};
-
-	/* External CAN clock - to be overridden by boards that provide it */
-	can_clk: can-clk {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <0>;
-	};
-
-	/* clock can be either from exclk or crystal oscillator (XIN/XOUT) */
-	extal_clk: extal-clk {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		/* This value must be overridden by the board */
-		clock-frequency = <0>;
-	};
-
-	cluster0_opp: opp-table-0 {
-		compatible = "operating-points-v2";
-		opp-shared;
-
-		opp-150000000 {
-			opp-hz = /bits/ 64 <150000000>;
-			opp-microvolt = <1100000>;
-			clock-latency-ns = <300000>;
-		};
-		opp-300000000 {
-			opp-hz = /bits/ 64 <300000000>;
-			opp-microvolt = <1100000>;
-			clock-latency-ns = <300000>;
-		};
-		opp-600000000 {
-			opp-hz = /bits/ 64 <600000000>;
-			opp-microvolt = <1100000>;
-			clock-latency-ns = <300000>;
-		};
-		opp-1200000000 {
-			opp-hz = /bits/ 64 <1200000000>;
-			opp-microvolt = <1100000>;
-			clock-latency-ns = <300000>;
-			opp-suspend;
-		};
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu-map {
-			cluster0 {
-				core0 {
-					cpu = <&cpu0>;
-				};
-				core1 {
-					cpu = <&cpu1>;
-				};
-			};
-		};
-
-		cpu0: cpu@0 {
-			compatible = "arm,cortex-a55";
-			reg = <0>;
-			device_type = "cpu";
-			#cooling-cells = <2>;
-			next-level-cache = <&L3_CA55>;
-			enable-method = "psci";
-			clocks = <&cpg CPG_CORE R9A07G054_CLK_I>;
-			operating-points-v2 = <&cluster0_opp>;
-		};
-
-		cpu1: cpu@100 {
-			compatible = "arm,cortex-a55";
-			reg = <0x100>;
-			device_type = "cpu";
-			next-level-cache = <&L3_CA55>;
-			enable-method = "psci";
-			clocks = <&cpg CPG_CORE R9A07G054_CLK_I>;
-			operating-points-v2 = <&cluster0_opp>;
-		};
-
-		L3_CA55: cache-controller-0 {
-			compatible = "cache";
-			cache-unified;
-			cache-size = <0x40000>;
-			cache-level = <3>;
-		};
-	};
-
-	gpu_opp_table: opp-table-1 {
-		compatible = "operating-points-v2";
-
-		opp-500000000 {
-			opp-hz = /bits/ 64 <500000000>;
-			opp-microvolt = <1100000>;
-		};
-
-		opp-400000000 {
-			opp-hz = /bits/ 64 <400000000>;
-			opp-microvolt = <1100000>;
-		};
-
-		opp-250000000 {
-			opp-hz = /bits/ 64 <250000000>;
-			opp-microvolt = <1100000>;
-		};
-
-		opp-200000000 {
-			opp-hz = /bits/ 64 <200000000>;
-			opp-microvolt = <1100000>;
-		};
-
-		opp-125000000 {
-			opp-hz = /bits/ 64 <125000000>;
-			opp-microvolt = <1100000>;
-		};
-
-		opp-100000000 {
-			opp-hz = /bits/ 64 <100000000>;
-			opp-microvolt = <1100000>;
-		};
+#define SOC_CPG_PREFIX(X)	R9A07G054_ ## X
 
-		opp-62500000 {
-			opp-hz = /bits/ 64 <62500000>;
-			opp-microvolt = <1100000>;
-		};
+#include "r9a07g044.dtsi"
 
-		opp-50000000 {
-			opp-hz = /bits/ 64 <50000000>;
-			opp-microvolt = <1100000>;
-		};
-	};
-
-	psci {
-		compatible = "arm,psci-1.0", "arm,psci-0.2";
-		method = "smc";
-	};
-
-	soc: soc {
-		compatible = "simple-bus";
-		interrupt-parent = <&gic>;
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		ssi0: ssi@10049c00 {
-			compatible = "renesas,r9a07g054-ssi",
-				     "renesas,rz-ssi";
-			reg = <0 0x10049c00 0 0x400>;
-			interrupts = <GIC_SPI 326 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 327 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 328 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 329 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt";
-			clocks = <&cpg CPG_MOD R9A07G054_SSI0_PCLK2>,
-				 <&cpg CPG_MOD R9A07G054_SSI0_PCLK_SFR>,
-				 <&audio_clk1>, <&audio_clk2>;
-			clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2";
-			resets = <&cpg R9A07G054_SSI0_RST_M2_REG>;
-			dmas = <&dmac 0x2655>, <&dmac 0x2656>;
-			dma-names = "tx", "rx";
-			power-domains = <&cpg>;
-			#sound-dai-cells = <0>;
-			status = "disabled";
-		};
-
-		ssi1: ssi@1004a000 {
-			compatible = "renesas,r9a07g054-ssi",
-				     "renesas,rz-ssi";
-			reg = <0 0x1004a000 0 0x400>;
-			interrupts = <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 331 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 332 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 333 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt";
-			clocks = <&cpg CPG_MOD R9A07G054_SSI1_PCLK2>,
-				 <&cpg CPG_MOD R9A07G054_SSI1_PCLK_SFR>,
-				 <&audio_clk1>, <&audio_clk2>;
-			clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2";
-			resets = <&cpg R9A07G054_SSI1_RST_M2_REG>;
-			dmas = <&dmac 0x2659>, <&dmac 0x265a>;
-			dma-names = "tx", "rx";
-			power-domains = <&cpg>;
-			#sound-dai-cells = <0>;
-			status = "disabled";
-		};
-
-		ssi2: ssi@1004a400 {
-			compatible = "renesas,r9a07g054-ssi",
-				     "renesas,rz-ssi";
-			reg = <0 0x1004a400 0 0x400>;
-			interrupts = <GIC_SPI 334 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 335 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 336 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 337 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt";
-			clocks = <&cpg CPG_MOD R9A07G054_SSI2_PCLK2>,
-				 <&cpg CPG_MOD R9A07G054_SSI2_PCLK_SFR>,
-				 <&audio_clk1>, <&audio_clk2>;
-			clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2";
-			resets = <&cpg R9A07G054_SSI2_RST_M2_REG>;
-			dmas = <&dmac 0x265f>;
-			dma-names = "rt";
-			power-domains = <&cpg>;
-			#sound-dai-cells = <0>;
-			status = "disabled";
-		};
-
-		ssi3: ssi@1004a800 {
-			compatible = "renesas,r9a07g054-ssi",
-				     "renesas,rz-ssi";
-			reg = <0 0x1004a800 0 0x400>;
-			interrupts = <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 339 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 341 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "int_req", "dma_rx", "dma_tx", "dma_rt";
-			clocks = <&cpg CPG_MOD R9A07G054_SSI3_PCLK2>,
-				 <&cpg CPG_MOD R9A07G054_SSI3_PCLK_SFR>,
-				 <&audio_clk1>, <&audio_clk2>;
-			clock-names = "ssi", "ssi_sfr", "audio_clk1", "audio_clk2";
-			resets = <&cpg R9A07G054_SSI3_RST_M2_REG>;
-			dmas = <&dmac 0x2661>, <&dmac 0x2662>;
-			dma-names = "tx", "rx";
-			power-domains = <&cpg>;
-			#sound-dai-cells = <0>;
-			status = "disabled";
-		};
-
-		spi0: spi@1004ac00 {
-			compatible = "renesas,r9a07g054-rspi", "renesas,rspi-rz";
-			reg = <0 0x1004ac00 0 0x400>;
-			interrupts = <GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 413 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "error", "rx", "tx";
-			clocks = <&cpg CPG_MOD R9A07G054_RSPI0_CLKB>;
-			resets = <&cpg R9A07G054_RSPI0_RST>;
-			dmas = <&dmac 0x2e95>, <&dmac 0x2e96>;
-			dma-names = "tx", "rx";
-			power-domains = <&cpg>;
-			num-cs = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
-
-		spi1: spi@1004b000 {
-			compatible = "renesas,r9a07g054-rspi", "renesas,rspi-rz";
-			reg = <0 0x1004b000 0 0x400>;
-			interrupts = <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "error", "rx", "tx";
-			clocks = <&cpg CPG_MOD R9A07G054_RSPI1_CLKB>;
-			resets = <&cpg R9A07G054_RSPI1_RST>;
-			dmas = <&dmac 0x2e99>, <&dmac 0x2e9a>;
-			dma-names = "tx", "rx";
-			power-domains = <&cpg>;
-			num-cs = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
-
-		spi2: spi@1004b400 {
-			compatible = "renesas,r9a07g054-rspi", "renesas,rspi-rz";
-			reg = <0 0x1004b400 0 0x400>;
-			interrupts = <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "error", "rx", "tx";
-			clocks = <&cpg CPG_MOD R9A07G054_RSPI2_CLKB>;
-			resets = <&cpg R9A07G054_RSPI2_RST>;
-			dmas = <&dmac 0x2e9d>, <&dmac 0x2e9e>;
-			dma-names = "tx", "rx";
-			power-domains = <&cpg>;
-			num-cs = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
-
-		scif0: serial@1004b800 {
-			compatible = "renesas,scif-r9a07g054",
-				     "renesas,scif-r9a07g044";
-			reg = <0 0x1004b800 0 0x400>;
-			interrupts = <GIC_SPI 380 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 382 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 384 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 384 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "eri", "rxi", "txi",
-					  "bri", "dri", "tei";
-			clocks = <&cpg CPG_MOD R9A07G054_SCIF0_CLK_PCK>;
-			clock-names = "fck";
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_SCIF0_RST_SYSTEM_N>;
-			status = "disabled";
-		};
-
-		scif1: serial@1004bc00 {
-			compatible = "renesas,scif-r9a07g054",
-				     "renesas,scif-r9a07g044";
-			reg = <0 0x1004bc00 0 0x400>;
-			interrupts = <GIC_SPI 385 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 387 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 388 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 386 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 389 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 389 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "eri", "rxi", "txi",
-					  "bri", "dri", "tei";
-			clocks = <&cpg CPG_MOD R9A07G054_SCIF1_CLK_PCK>;
-			clock-names = "fck";
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_SCIF1_RST_SYSTEM_N>;
-			status = "disabled";
-		};
-
-		scif2: serial@1004c000 {
-			compatible = "renesas,scif-r9a07g054",
-				     "renesas,scif-r9a07g044";
-			reg = <0 0x1004c000 0 0x400>;
-			interrupts = <GIC_SPI 390 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 392 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 393 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 391 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 394 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 394 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "eri", "rxi", "txi",
-					  "bri", "dri", "tei";
-			clocks = <&cpg CPG_MOD R9A07G054_SCIF2_CLK_PCK>;
-			clock-names = "fck";
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_SCIF2_RST_SYSTEM_N>;
-			status = "disabled";
-		};
-
-		scif3: serial@1004c400 {
-			compatible = "renesas,scif-r9a07g054",
-				     "renesas,scif-r9a07g044";
-			reg = <0 0x1004c400 0 0x400>;
-			interrupts = <GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 397 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 398 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 396 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 399 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 399 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "eri", "rxi", "txi",
-					  "bri", "dri", "tei";
-			clocks = <&cpg CPG_MOD R9A07G054_SCIF3_CLK_PCK>;
-			clock-names = "fck";
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_SCIF3_RST_SYSTEM_N>;
-			status = "disabled";
-		};
-
-		scif4: serial@1004c800 {
-			compatible = "renesas,scif-r9a07g054",
-				     "renesas,scif-r9a07g044";
-			reg = <0 0x1004c800 0 0x400>;
-			interrupts = <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 402 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 403 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 401 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "eri", "rxi", "txi",
-					  "bri", "dri", "tei";
-			clocks = <&cpg CPG_MOD R9A07G054_SCIF4_CLK_PCK>;
-			clock-names = "fck";
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_SCIF4_RST_SYSTEM_N>;
-			status = "disabled";
-		};
-
-		sci0: serial@1004d000 {
-			compatible = "renesas,r9a07g054-sci", "renesas,sci";
-			reg = <0 0x1004d000 0 0x400>;
-			interrupts = <GIC_SPI 405 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 406 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 407 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 408 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "eri", "rxi", "txi", "tei";
-			clocks = <&cpg CPG_MOD R9A07G054_SCI0_CLKP>;
-			clock-names = "fck";
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_SCI0_RST>;
-			status = "disabled";
-		};
+/ {
+	compatible = "renesas,r9a07g054";
+};
 
-		sci1: serial@1004d400 {
-			compatible = "renesas,r9a07g054-sci", "renesas,sci";
-			reg = <0 0x1004d400 0 0x400>;
-			interrupts = <GIC_SPI 409 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 410 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 411 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "eri", "rxi", "txi", "tei";
-			clocks = <&cpg CPG_MOD R9A07G054_SCI1_CLKP>;
-			clock-names = "fck";
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_SCI1_RST>;
-			status = "disabled";
-		};
+&adc {
+	compatible = "renesas,r9a07g054-adc", "renesas,rzg2l-adc";
+};
 
-		canfd: can@10050000 {
-			compatible = "renesas,r9a07g054-canfd", "renesas,rzg2l-canfd";
-			reg = <0 0x10050000 0 0x8000>;
-			interrupts = <GIC_SPI 426 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 427 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 428 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 429 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "g_err", "g_recc",
-					  "ch0_err", "ch0_rec", "ch0_trx",
-					  "ch1_err", "ch1_rec", "ch1_trx";
-			clocks = <&cpg CPG_MOD R9A07G054_CANFD_PCLK>,
-				 <&cpg CPG_CORE R9A07G054_CLK_P0_DIV2>,
-				 <&can_clk>;
-			clock-names = "fck", "canfd", "can_clk";
-			assigned-clocks = <&cpg CPG_CORE R9A07G054_CLK_P0_DIV2>;
-			assigned-clock-rates = <50000000>;
-			resets = <&cpg R9A07G054_CANFD_RSTP_N>,
-				 <&cpg R9A07G054_CANFD_RSTC_N>;
-			reset-names = "rstp_n", "rstc_n";
-			power-domains = <&cpg>;
-			status = "disabled";
+&canfd {
+	compatible = "renesas,r9a07g054-canfd", "renesas,rzg2l-canfd";
+};
 
-			channel0 {
-				status = "disabled";
-			};
-			channel1 {
-				status = "disabled";
-			};
-		};
+&cpg {
+	compatible = "renesas,r9a07g054-cpg";
+};
 
-		i2c0: i2c@10058000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "renesas,riic-r9a07g054", "renesas,riic-rz";
-			reg = <0 0x10058000 0 0x400>;
-			interrupts = <GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 348 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 349 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 351 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "tei", "ri", "ti", "spi", "sti",
-					  "naki", "ali", "tmoi";
-			clocks = <&cpg CPG_MOD R9A07G054_I2C0_PCLK>;
-			clock-frequency = <100000>;
-			resets = <&cpg R9A07G054_I2C0_MRST>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&dmac {
+	compatible = "renesas,r9a07g054-dmac", "renesas,rz-dmac";
+};
 
-		i2c1: i2c@10058400 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "renesas,riic-r9a07g054", "renesas,riic-rz";
-			reg = <0 0x10058400 0 0x400>;
-			interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 356 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 357 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 362 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 363 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "tei", "ri", "ti", "spi", "sti",
-					  "naki", "ali", "tmoi";
-			clocks = <&cpg CPG_MOD R9A07G054_I2C1_PCLK>;
-			clock-frequency = <100000>;
-			resets = <&cpg R9A07G054_I2C1_MRST>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&eth0 {
+	compatible = "renesas,r9a07g054-gbeth", "renesas,rzg2l-gbeth";
+};
 
-		i2c2: i2c@10058800 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "renesas,riic-r9a07g054", "renesas,riic-rz";
-			reg = <0 0x10058800 0 0x400>;
-			interrupts = <GIC_SPI 366 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 364 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 365 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 369 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 367 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "tei", "ri", "ti", "spi", "sti",
-					  "naki", "ali", "tmoi";
-			clocks = <&cpg CPG_MOD R9A07G054_I2C2_PCLK>;
-			clock-frequency = <100000>;
-			resets = <&cpg R9A07G054_I2C2_MRST>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&eth1 {
+	compatible = "renesas,r9a07g054-gbeth", "renesas,rzg2l-gbeth";
+};
 
-		i2c3: i2c@10058c00 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "renesas,riic-r9a07g054", "renesas,riic-rz";
-			reg = <0 0x10058c00 0 0x400>;
-			interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 372 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 373 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "tei", "ri", "ti", "spi", "sti",
-					  "naki", "ali", "tmoi";
-			clocks = <&cpg CPG_MOD R9A07G054_I2C3_PCLK>;
-			clock-frequency = <100000>;
-			resets = <&cpg R9A07G054_I2C3_MRST>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&gpu {
+	compatible = "renesas,r9a07g054-mali", "arm,mali-bifrost";
+};
 
-		adc: adc@10059000 {
-			compatible = "renesas,r9a07g054-adc", "renesas,rzg2l-adc";
-			reg = <0 0x10059000 0 0x400>;
-			interrupts = <GIC_SPI 347 IRQ_TYPE_EDGE_RISING>;
-			clocks = <&cpg CPG_MOD R9A07G054_ADC_ADCLK>,
-				 <&cpg CPG_MOD R9A07G054_ADC_PCLK>;
-			clock-names = "adclk", "pclk";
-			resets = <&cpg R9A07G054_ADC_PRESETN>,
-				 <&cpg R9A07G054_ADC_ADRST_N>;
-			reset-names = "presetn", "adrst-n";
-			power-domains = <&cpg>;
-			status = "disabled";
+&hsusb {
+	compatible = "renesas,usbhs-r9a07g054", "renesas,rza2-usbhs";
+};
 
-			#address-cells = <1>;
-			#size-cells = <0>;
+&i2c0 {
+	compatible = "renesas,riic-r9a07g054", "renesas,riic-rz";
+};
 
-			channel@0 {
-				reg = <0>;
-			};
-			channel@1 {
-				reg = <1>;
-			};
-			channel@2 {
-				reg = <2>;
-			};
-			channel@3 {
-				reg = <3>;
-			};
-			channel@4 {
-				reg = <4>;
-			};
-			channel@5 {
-				reg = <5>;
-			};
-			channel@6 {
-				reg = <6>;
-			};
-			channel@7 {
-				reg = <7>;
-			};
-		};
+&i2c1 {
+	compatible = "renesas,riic-r9a07g054", "renesas,riic-rz";
+};
 
-		tsu: thermal@10059400 {
-			compatible = "renesas,r9a07g054-tsu",
-				     "renesas,rzg2l-tsu";
-			reg = <0 0x10059400 0 0x400>;
-			clocks = <&cpg CPG_MOD R9A07G054_TSU_PCLK>;
-			resets = <&cpg R9A07G054_TSU_PRESETN>;
-			power-domains = <&cpg>;
-			#thermal-sensor-cells = <1>;
-		};
+&i2c2 {
+	compatible = "renesas,riic-r9a07g054", "renesas,riic-rz";
+};
 
-		sbc: spi@10060000 {
-			compatible = "renesas,r9a07g054-rpc-if",
-				     "renesas,rzg2l-rpc-if";
-			reg = <0 0x10060000 0 0x10000>,
-			      <0 0x20000000 0 0x10000000>,
-			      <0 0x10070000 0 0x10000>;
-			reg-names = "regs", "dirmap", "wbuf";
-			interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_SPI_CLK2>,
-				 <&cpg CPG_MOD R9A07G054_SPI_CLK>;
-			resets = <&cpg R9A07G054_SPI_RST>;
-			power-domains = <&cpg>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
+&i2c3 {
+	compatible = "renesas,riic-r9a07g054", "renesas,riic-rz";
+};
 
-		cpg: clock-controller@11010000 {
-			compatible = "renesas,r9a07g054-cpg";
-			reg = <0 0x11010000 0 0x10000>;
-			clocks = <&extal_clk>;
-			clock-names = "extal";
-			#clock-cells = <2>;
-			#reset-cells = <1>;
-			#power-domain-cells = <0>;
-		};
+&irqc {
+	compatible = "renesas,r9a07g054-irqc", "renesas,rzg2l-irqc";
+};
 
-		sysc: system-controller@11020000 {
-			compatible = "renesas,r9a07g054-sysc";
-			reg = <0 0x11020000 0 0x10000>;
-			interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "lpm_int", "ca55stbydone_int",
-					  "cm33stbyr_int", "ca55_deny";
-			status = "disabled";
-		};
+&ostm0 {
+	compatible = "renesas,r9a07g054-ostm", "renesas,ostm";
+};
 
-		pinctrl: pinctrl@11030000 {
-			compatible = "renesas,r9a07g054-pinctrl",
-				     "renesas,r9a07g044-pinctrl";
-			reg = <0 0x11030000 0 0x10000>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			#interrupt-cells = <2>;
-			interrupt-parent = <&irqc>;
-			interrupt-controller;
-			gpio-ranges = <&pinctrl 0 0 392>;
-			clocks = <&cpg CPG_MOD R9A07G054_GPIO_HCLK>;
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_GPIO_RSTN>,
-				 <&cpg R9A07G054_GPIO_PORT_RESETN>,
-				 <&cpg R9A07G054_GPIO_SPARE_RESETN>;
-		};
+&ostm1 {
+	compatible = "renesas,r9a07g054-ostm", "renesas,ostm";
+};
 
-		irqc: interrupt-controller@110a0000 {
-			compatible = "renesas,r9a07g054-irqc",
-				     "renesas,rzg2l-irqc";
-			#interrupt-cells = <2>;
-			#address-cells = <0>;
-			interrupt-controller;
-			reg = <0 0x110a0000 0 0x10000>;
-			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 444 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 445 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 446 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 447 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 448 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 449 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 450 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 451 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 452 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 453 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 454 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 455 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 456 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 457 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 458 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 459 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 460 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 461 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 462 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 463 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 464 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 470 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 471 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 475 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_IA55_CLK>,
-				 <&cpg CPG_MOD R9A07G054_IA55_PCLK>;
-			clock-names = "clk", "pclk";
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_IA55_RESETN>;
-		};
+&ostm2 {
+	compatible = "renesas,r9a07g054-ostm", "renesas,ostm";
+};
 
-		dmac: dma-controller@11820000 {
-			compatible = "renesas,r9a07g054-dmac",
-				     "renesas,rz-dmac";
-			reg = <0 0x11820000 0 0x10000>,
-			      <0 0x11830000 0 0x10000>;
-			interrupts = <GIC_SPI 141 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 125 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 126 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 127 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 128 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 129 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 130 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 131 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 132 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 133 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 134 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 135 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 136 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 137 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 138 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 139 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 140 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "error",
-					  "ch0", "ch1", "ch2", "ch3",
-					  "ch4", "ch5", "ch6", "ch7",
-					  "ch8", "ch9", "ch10", "ch11",
-					  "ch12", "ch13", "ch14", "ch15";
-			clocks = <&cpg CPG_MOD R9A07G054_DMAC_ACLK>,
-				 <&cpg CPG_MOD R9A07G054_DMAC_PCLK>;
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_DMAC_ARESETN>,
-				 <&cpg R9A07G054_DMAC_RST_ASYNC>;
-			#dma-cells = <1>;
-			dma-channels = <16>;
-		};
+&phyrst {
+	compatible = "renesas,r9a07g054-usbphy-ctrl", "renesas,rzg2l-usbphy-ctrl";
+};
 
-		gpu: gpu@11840000 {
-			compatible = "renesas,r9a07g054-mali",
-				     "arm,mali-bifrost";
-			reg = <0x0 0x11840000 0x0 0x10000>;
-			interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "job", "mmu", "gpu", "event";
-			clocks = <&cpg CPG_MOD R9A07G054_GPU_CLK>,
-				 <&cpg CPG_MOD R9A07G054_GPU_AXI_CLK>,
-				 <&cpg CPG_MOD R9A07G054_GPU_ACE_CLK>;
-			clock-names = "gpu", "bus", "bus_ace";
-			power-domains = <&cpg>;
-			resets = <&cpg R9A07G054_GPU_RESETN>,
-				 <&cpg R9A07G054_GPU_AXI_RESETN>,
-				 <&cpg R9A07G054_GPU_ACE_RESETN>;
-			reset-names = "rst", "axi_rst", "ace_rst";
-			operating-points-v2 = <&gpu_opp_table>;
-		};
+&pinctrl {
+	compatible = "renesas,r9a07g054-pinctrl", "renesas,r9a07g044-pinctrl";
+};
 
-		gic: interrupt-controller@11900000 {
-			compatible = "arm,gic-v3";
-			#interrupt-cells = <3>;
-			#address-cells = <0>;
-			interrupt-controller;
-			reg = <0x0 0x11900000 0 0x40000>,
-			      <0x0 0x11940000 0 0x60000>;
-			interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_LOW>;
-		};
+&sbc {
+	compatible = "renesas,r9a07g054-rpc-if", "renesas,rzg2l-rpc-if";
+};
 
-		sdhi0: mmc@11c00000 {
-			compatible = "renesas,sdhi-r9a07g054",
-				     "renesas,rcar-gen3-sdhi";
-			reg = <0x0 0x11c00000 0 0x10000>;
-			interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_SDHI0_IMCLK>,
-				 <&cpg CPG_MOD R9A07G054_SDHI0_CLK_HS>,
-				 <&cpg CPG_MOD R9A07G054_SDHI0_IMCLK2>,
-				 <&cpg CPG_MOD R9A07G054_SDHI0_ACLK>;
-			clock-names = "core", "clkh", "cd", "aclk";
-			resets = <&cpg R9A07G054_SDHI0_IXRST>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&sci0 {
+	compatible = "renesas,r9a07g054-sci", "renesas,sci";
+};
 
-		sdhi1: mmc@11c10000 {
-			compatible = "renesas,sdhi-r9a07g054",
-				     "renesas,rcar-gen3-sdhi";
-			reg = <0x0 0x11c10000 0 0x10000>;
-			interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_SDHI1_IMCLK>,
-				 <&cpg CPG_MOD R9A07G054_SDHI1_CLK_HS>,
-				 <&cpg CPG_MOD R9A07G054_SDHI1_IMCLK2>,
-				 <&cpg CPG_MOD R9A07G054_SDHI1_ACLK>;
-			clock-names = "core", "clkh", "cd", "aclk";
-			resets = <&cpg R9A07G054_SDHI1_IXRST>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&sci1 {
+	compatible = "renesas,r9a07g054-sci", "renesas,sci";
+};
 
-		eth0: ethernet@11c20000 {
-			compatible = "renesas,r9a07g054-gbeth",
-				     "renesas,rzg2l-gbeth";
-			reg = <0 0x11c20000 0 0x10000>;
-			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "mux", "fil", "arp_ns";
-			phy-mode = "rgmii";
-			clocks = <&cpg CPG_MOD R9A07G054_ETH0_CLK_AXI>,
-				 <&cpg CPG_MOD R9A07G054_ETH0_CLK_CHI>,
-				 <&cpg CPG_CORE R9A07G054_CLK_HP>;
-			clock-names = "axi", "chi", "refclk";
-			resets = <&cpg R9A07G054_ETH0_RST_HW_N>;
-			power-domains = <&cpg>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
+&scif0 {
+	compatible = "renesas,scif-r9a07g054", "renesas,scif-r9a07g044";
+};
 
-		eth1: ethernet@11c30000 {
-			compatible = "renesas,r9a07g054-gbeth",
-				     "renesas,rzg2l-gbeth";
-			reg = <0 0x11c30000 0 0x10000>;
-			interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "mux", "fil", "arp_ns";
-			phy-mode = "rgmii";
-			clocks = <&cpg CPG_MOD R9A07G054_ETH1_CLK_AXI>,
-				 <&cpg CPG_MOD R9A07G054_ETH1_CLK_CHI>,
-				 <&cpg CPG_CORE R9A07G054_CLK_HP>;
-			clock-names = "axi", "chi", "refclk";
-			resets = <&cpg R9A07G054_ETH1_RST_HW_N>;
-			power-domains = <&cpg>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
+&scif1 {
+	compatible = "renesas,scif-r9a07g054", "renesas,scif-r9a07g044";
+};
 
-		phyrst: usbphy-ctrl@11c40000 {
-			compatible = "renesas,r9a07g054-usbphy-ctrl",
-				     "renesas,rzg2l-usbphy-ctrl";
-			reg = <0 0x11c40000 0 0x10000>;
-			clocks = <&cpg CPG_MOD R9A07G054_USB_PCLK>;
-			resets = <&cpg R9A07G054_USB_PRESETN>;
-			power-domains = <&cpg>;
-			#reset-cells = <1>;
-			status = "disabled";
-		};
+&scif2 {
+	compatible = "renesas,scif-r9a07g054", "renesas,scif-r9a07g044";
+};
 
-		ohci0: usb@11c50000 {
-			compatible = "generic-ohci";
-			reg = <0 0x11c50000 0 0x100>;
-			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G054_USB_U2H0_HCLK>;
-			resets = <&phyrst 0>,
-				 <&cpg R9A07G054_USB_U2H0_HRESETN>;
-			phys = <&usb2_phy0 1>;
-			phy-names = "usb";
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&scif3 {
+	compatible = "renesas,scif-r9a07g054", "renesas,scif-r9a07g044";
+};
 
-		ohci1: usb@11c70000 {
-			compatible = "generic-ohci";
-			reg = <0 0x11c70000 0 0x100>;
-			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G054_USB_U2H1_HCLK>;
-			resets = <&phyrst 1>,
-				 <&cpg R9A07G054_USB_U2H1_HRESETN>;
-			phys = <&usb2_phy1 1>;
-			phy-names = "usb";
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&scif4 {
+	compatible = "renesas,scif-r9a07g054", "renesas,scif-r9a07g044";
+};
 
-		ehci0: usb@11c50100 {
-			compatible = "generic-ehci";
-			reg = <0 0x11c50100 0 0x100>;
-			interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G054_USB_U2H0_HCLK>;
-			resets = <&phyrst 0>,
-				 <&cpg R9A07G054_USB_U2H0_HRESETN>;
-			phys = <&usb2_phy0 2>;
-			phy-names = "usb";
-			companion = <&ohci0>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&sdhi0 {
+	compatible = "renesas,sdhi-r9a07g054", "renesas,rcar-gen3-sdhi";
+};
 
-		ehci1: usb@11c70100 {
-			compatible = "generic-ehci";
-			reg = <0 0x11c70100 0 0x100>;
-			interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G054_USB_U2H1_HCLK>;
-			resets = <&phyrst 1>,
-				 <&cpg R9A07G054_USB_U2H1_HRESETN>;
-			phys = <&usb2_phy1 2>;
-			phy-names = "usb";
-			companion = <&ohci1>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&sdhi1 {
+	compatible = "renesas,sdhi-r9a07g054", "renesas,rcar-gen3-sdhi";
+};
 
-		usb2_phy0: usb-phy@11c50200 {
-			compatible = "renesas,usb2-phy-r9a07g054",
-				     "renesas,rzg2l-usb2-phy";
-			reg = <0 0x11c50200 0 0x700>;
-			interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G054_USB_U2H0_HCLK>;
-			resets = <&phyrst 0>;
-			#phy-cells = <1>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&spi0 {
+	compatible = "renesas,r9a07g054-rspi", "renesas,rspi-rz";
+};
 
-		usb2_phy1: usb-phy@11c70200 {
-			compatible = "renesas,usb2-phy-r9a07g054",
-				     "renesas,rzg2l-usb2-phy";
-			reg = <0 0x11c70200 0 0x700>;
-			interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G054_USB_U2H1_HCLK>;
-			resets = <&phyrst 1>;
-			#phy-cells = <1>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&spi1 {
+	compatible = "renesas,r9a07g054-rspi", "renesas,rspi-rz";
+};
 
-		hsusb: usb@11c60000 {
-			compatible = "renesas,usbhs-r9a07g054",
-				     "renesas,rza2-usbhs";
-			reg = <0 0x11c60000 0 0x10000>;
-			interrupts = <GIC_SPI 100 IRQ_TYPE_EDGE_RISING>,
-				     <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD R9A07G054_USB_PCLK>,
-				 <&cpg CPG_MOD R9A07G054_USB_U2P_EXR_CPUCLK>;
-			resets = <&phyrst 0>,
-				 <&cpg R9A07G054_USB_U2P_EXL_SYSRST>;
-			renesas,buswait = <7>;
-			phys = <&usb2_phy0 3>;
-			phy-names = "usb";
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&spi2 {
+	compatible = "renesas,r9a07g054-rspi", "renesas,rspi-rz";
+};
 
-		wdt0: watchdog@12800800 {
-			compatible = "renesas,r9a07g054-wdt",
-				     "renesas,rzg2l-wdt";
-			reg = <0 0x12800800 0 0x400>;
-			clocks = <&cpg CPG_MOD R9A07G054_WDT0_PCLK>,
-				 <&cpg CPG_MOD R9A07G054_WDT0_CLK>;
-			clock-names = "pclk", "oscclk";
-			interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "wdt", "perrout";
-			resets = <&cpg R9A07G054_WDT0_PRESETN>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&ssi0 {
+	compatible = "renesas,r9a07g054-ssi", "renesas,rz-ssi";
+};
 
-		wdt1: watchdog@12800c00 {
-			compatible = "renesas,r9a07g054-wdt",
-				     "renesas,rzg2l-wdt";
-			reg = <0 0x12800C00 0 0x400>;
-			clocks = <&cpg CPG_MOD R9A07G054_WDT1_PCLK>,
-				 <&cpg CPG_MOD R9A07G054_WDT1_CLK>;
-			clock-names = "pclk", "oscclk";
-			interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "wdt", "perrout";
-			resets = <&cpg R9A07G054_WDT1_PRESETN>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&ssi1 {
+	compatible = "renesas,r9a07g054-ssi", "renesas,rz-ssi";
+};
 
-		ostm0: timer@12801000 {
-			compatible = "renesas,r9a07g054-ostm",
-				     "renesas,ostm";
-			reg = <0x0 0x12801000 0x0 0x400>;
-			interrupts = <GIC_SPI 46 IRQ_TYPE_EDGE_RISING>;
-			clocks = <&cpg CPG_MOD R9A07G054_OSTM0_PCLK>;
-			resets = <&cpg R9A07G054_OSTM0_PRESETZ>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&ssi2 {
+	compatible = "renesas,r9a07g054-ssi", "renesas,rz-ssi";
+};
 
-		ostm1: timer@12801400 {
-			compatible = "renesas,r9a07g054-ostm",
-				     "renesas,ostm";
-			reg = <0x0 0x12801400 0x0 0x400>;
-			interrupts = <GIC_SPI 47 IRQ_TYPE_EDGE_RISING>;
-			clocks = <&cpg CPG_MOD R9A07G054_OSTM1_PCLK>;
-			resets = <&cpg R9A07G054_OSTM1_PRESETZ>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
+&ssi3 {
+	compatible = "renesas,r9a07g054-ssi", "renesas,rz-ssi";
+};
 
-		ostm2: timer@12801800 {
-			compatible = "renesas,r9a07g054-ostm",
-				     "renesas,ostm";
-			reg = <0x0 0x12801800 0x0 0x400>;
-			interrupts = <GIC_SPI 48 IRQ_TYPE_EDGE_RISING>;
-			clocks = <&cpg CPG_MOD R9A07G054_OSTM2_PCLK>;
-			resets = <&cpg R9A07G054_OSTM2_PRESETZ>;
-			power-domains = <&cpg>;
-			status = "disabled";
-		};
-	};
+&sysc {
+	compatible = "renesas,r9a07g054-sysc";
+};
 
-	thermal-zones {
-		cpu-thermal {
-			polling-delay-passive = <250>;
-			polling-delay = <1000>;
-			thermal-sensors = <&tsu 0>;
-			sustainable-power = <717>;
+&tsu {
+	compatible = "renesas,r9a07g054-tsu", "renesas,rzg2l-tsu";
+};
 
-			cooling-maps {
-				map0 {
-					trip = <&target>;
-					cooling-device = <&cpu0 0 2>;
-					contribution = <1024>;
-				};
-			};
+&usb2_phy0 {
+	compatible = "renesas,usb2-phy-r9a07g054", "renesas,rzg2l-usb2-phy";
+};
 
-			trips {
-				sensor_crit: sensor-crit {
-					temperature = <125000>;
-					hysteresis = <1000>;
-					type = "critical";
-				};
+&usb2_phy1 {
+	compatible = "renesas,usb2-phy-r9a07g054", "renesas,rzg2l-usb2-phy";
+};
 
-				target: trip-point {
-					temperature = <100000>;
-					hysteresis = <1000>;
-					type = "passive";
-				};
-			};
-		};
-	};
+&wdt0 {
+	compatible = "renesas,r9a07g054-wdt", "renesas,rzg2l-wdt";
+};
 
-	timer {
-		compatible = "arm,armv8-timer";
-		interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-				      <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-				      <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
-				      <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
-	};
+&wdt1 {
+	compatible = "renesas,r9a07g054-wdt", "renesas,rzg2l-wdt";
 };
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH v2 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET
  2023-01-31 22:35 ` [PATCH v2 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET Prabhakar
@ 2023-02-13 14:09   ` Geert Uytterhoeven
  2023-02-13 14:51     ` Lad, Prabhakar
  2023-03-08 12:56   ` Krzysztof Kozlowski
  1 sibling, 1 reply; 10+ messages in thread
From: Geert Uytterhoeven @ 2023-02-13 14:09 UTC (permalink / raw)
  To: Prabhakar
  Cc: Magnus Damm, Rob Herring, Krzysztof Kozlowski, linux-renesas-soc,
	devicetree, linux-kernel, Biju Das, Lad Prabhakar

Hi Prabhakar,

On Tue, Jan 31, 2023 at 11:42 PM Prabhakar <prabhakar.csengg@gmail.com> wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> Use a SoC specific macro for CPG and RESET so that we can re-use the
> RZ/G2L SoC DTSI for RZ/V2L SoC by just updating the SoC specific macro.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> v1->v2
> * No change

Thanks for your patch!

> --- a/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
> @@ -1,12 +1,16 @@
>  // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>  /*
> - * Device Tree Source for the RZ/G2L and RZ/G2LC common SoC parts
> + * Device Tree Source for the RZ/G2L, RZ/G2LC and RZ/V2L common SoC parts
>   *
>   * Copyright (C) 2021 Renesas Electronics Corp.
>   */
>
>  #include <dt-bindings/interrupt-controller/arm-gic.h>
> +
> +#ifndef SOC_CPG_PREFIX
>  #include <dt-bindings/clock/r9a07g044-cpg.h>
> +#define SOC_CPG_PREFIX(X)      R9A07G044_ ## X

As we're setting a precedent, this might as well be just SOC_PREFIX(X).
Some SoCs have multiple sets of definitions.
I can make that change myself while/if applying.

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

> +#endif

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v2 2/2] arm64: dts: renesas: r9a07g054: Reuse RZ/G2L SoC DTSI
  2023-01-31 22:35 ` [PATCH v2 2/2] arm64: dts: renesas: r9a07g054: Reuse RZ/G2L SoC DTSI Prabhakar
@ 2023-02-13 14:10   ` Geert Uytterhoeven
  0 siblings, 0 replies; 10+ messages in thread
From: Geert Uytterhoeven @ 2023-02-13 14:10 UTC (permalink / raw)
  To: Prabhakar
  Cc: Magnus Damm, Rob Herring, Krzysztof Kozlowski, linux-renesas-soc,
	devicetree, linux-kernel, Biju Das, Lad Prabhakar

On Tue, Jan 31, 2023 at 11:43 PM Prabhakar <prabhakar.csengg@gmail.com> wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
>
> RZ/V2L SoC is almost identical to RZ/G2L SoC hence re-use the RZ/G2L SoC
> DTSI and just update the compatible strings wherever required.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> v1->v2
> * Sorted the nodes based on the names

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC
  2023-01-31 22:35 [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC Prabhakar
  2023-01-31 22:35 ` [PATCH v2 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET Prabhakar
  2023-01-31 22:35 ` [PATCH v2 2/2] arm64: dts: renesas: r9a07g054: Reuse RZ/G2L SoC DTSI Prabhakar
@ 2023-02-13 14:16 ` Geert Uytterhoeven
  2023-03-10 10:41   ` Geert Uytterhoeven
  2 siblings, 1 reply; 10+ messages in thread
From: Geert Uytterhoeven @ 2023-02-13 14:16 UTC (permalink / raw)
  To: Rob Herring, Krzysztof Kozlowski
  Cc: Magnus Damm, linux-renesas-soc, devicetree, linux-kernel,
	Biju Das, Lad Prabhakar, Prabhakar

Hi Rob, Krzysztof,

On Tue, Jan 31, 2023 at 11:42 PM Prabhakar <prabhakar.csengg@gmail.com> wrote:
> This series aims to reuse RZ/G2L SoC DTSI with RZ/V2L as both the SoCs are
> almost identical.
>
> v1 -> v2
> * Patch 1/2 unchanged, for patch 2/2 sorted the nodes based on the names.
>
> v1: https://patchwork.kernel.org/project/linux-renesas-soc/cover/20230127133909.144774-1-prabhakar.mahadev-lad.rj@bp.renesas.com/
>
> Cheers,
> Prabhakar
>
> Lad Prabhakar (2):
>   arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and
>     RESET
>   arm64: dts: renesas: r9a07g054: Reuse RZ/G2L SoC DTSI
>
>  arch/arm64/boot/dts/renesas/r9a07g044.dtsi |  254 ++---
>  arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 1149 +++-----------------
>  2 files changed, 256 insertions(+), 1147 deletions(-)

Do you have an opinion on this series?
Is this acceptable for you?
The final generated DTBs are identical to before.

Thanks!

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v2 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET
  2023-02-13 14:09   ` Geert Uytterhoeven
@ 2023-02-13 14:51     ` Lad, Prabhakar
  0 siblings, 0 replies; 10+ messages in thread
From: Lad, Prabhakar @ 2023-02-13 14:51 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Magnus Damm, Rob Herring, Krzysztof Kozlowski, linux-renesas-soc,
	devicetree, linux-kernel, Biju Das, Lad Prabhakar

Hi Geert,

Thank you for the review.

On Mon, Feb 13, 2023 at 2:09 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> Hi Prabhakar,
>
> On Tue, Jan 31, 2023 at 11:42 PM Prabhakar <prabhakar.csengg@gmail.com> wrote:
> > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> >
> > Use a SoC specific macro for CPG and RESET so that we can re-use the
> > RZ/G2L SoC DTSI for RZ/V2L SoC by just updating the SoC specific macro.
> >
> > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> > ---
> > v1->v2
> > * No change
>
> Thanks for your patch!
>
> > --- a/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
> > @@ -1,12 +1,16 @@
> >  // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> >  /*
> > - * Device Tree Source for the RZ/G2L and RZ/G2LC common SoC parts
> > + * Device Tree Source for the RZ/G2L, RZ/G2LC and RZ/V2L common SoC parts
> >   *
> >   * Copyright (C) 2021 Renesas Electronics Corp.
> >   */
> >
> >  #include <dt-bindings/interrupt-controller/arm-gic.h>
> > +
> > +#ifndef SOC_CPG_PREFIX
> >  #include <dt-bindings/clock/r9a07g044-cpg.h>
> > +#define SOC_CPG_PREFIX(X)      R9A07G044_ ## X
>
> As we're setting a precedent, this might as well be just SOC_PREFIX(X).
> Some SoCs have multiple sets of definitions.
Agreed.

> I can make that change myself while/if applying.
>
Thank you.

> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> > +#endif
>
Cheers,
Prabhakar

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v2 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET
  2023-01-31 22:35 ` [PATCH v2 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET Prabhakar
  2023-02-13 14:09   ` Geert Uytterhoeven
@ 2023-03-08 12:56   ` Krzysztof Kozlowski
  1 sibling, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2023-03-08 12:56 UTC (permalink / raw)
  To: Prabhakar, Geert Uytterhoeven, Magnus Damm
  Cc: Rob Herring, Krzysztof Kozlowski, linux-renesas-soc, devicetree,
	linux-kernel, Biju Das, Lad Prabhakar

On 31/01/2023 23:35, Prabhakar wrote:
> From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> 
> Use a SoC specific macro for CPG and RESET so that we can re-use the
> RZ/G2L SoC DTSI for RZ/V2L SoC by just updating the SoC specific macro.
> 
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> v1->v2
> * No change
> ---
>  arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 254 +++++++++++----------
>  1 file changed, 129 insertions(+), 125 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/renesas/r9a07g044.dtsi b/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
> index 487536696d90..80b2332798d9 100644
> --- a/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r9a07g044.dtsi
> @@ -1,12 +1,16 @@
>  // SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
>  /*
> - * Device Tree Source for the RZ/G2L and RZ/G2LC common SoC parts
> + * Device Tree Source for the RZ/G2L, RZ/G2LC and RZ/V2L common SoC parts
>   *
>   * Copyright (C) 2021 Renesas Electronics Corp.
>   */
>  
>  #include <dt-bindings/interrupt-controller/arm-gic.h>
> +
> +#ifndef SOC_CPG_PREFIX
>  #include <dt-bindings/clock/r9a07g044-cpg.h>
> +#define SOC_CPG_PREFIX(X)	R9A07G044_ ## X
> +#endif
>  

I don't oppose it, but since I was asked on IRC about opinion, let me
share my feelings also here:

This patch #1 makes git grep difficult, reading code also a bit more
tricky. It's opposite of readability. The patchset obfuscates which
clocks will be used on r9a07g054 (so patch #2, the one which includes
other DTSI). To figure this out, I need to decode the macro for in one
file and  then open second file... but the prefix is also defined there!
Same constant in two places. So order of inclusion also matters?
Confusing code.

If the IDs and clocks are the same, maybe the constants/names in headers
should be unified?

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC
  2023-02-13 14:16 ` [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC Geert Uytterhoeven
@ 2023-03-10 10:41   ` Geert Uytterhoeven
  2023-03-12 20:07     ` Lad, Prabhakar
  0 siblings, 1 reply; 10+ messages in thread
From: Geert Uytterhoeven @ 2023-03-10 10:41 UTC (permalink / raw)
  To: Lad Prabhakar
  Cc: Magnus Damm, linux-renesas-soc, devicetree, linux-kernel,
	Biju Das, Prabhakar, Rob Herring, Krzysztof Kozlowski

Hi Prabhakar,

On Mon, Feb 13, 2023 at 3:16 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> On Tue, Jan 31, 2023 at 11:42 PM Prabhakar <prabhakar.csengg@gmail.com> wrote:
> > This series aims to reuse RZ/G2L SoC DTSI with RZ/V2L as both the SoCs are
> > almost identical.
> >
> > v1 -> v2
> > * Patch 1/2 unchanged, for patch 2/2 sorted the nodes based on the names.
> >
> > v1: https://patchwork.kernel.org/project/linux-renesas-soc/cover/20230127133909.144774-1-prabhakar.mahadev-lad.rj@bp.renesas.com/
> >
> > Cheers,
> > Prabhakar
> >
> > Lad Prabhakar (2):
> >   arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and
> >     RESET
> >   arm64: dts: renesas: r9a07g054: Reuse RZ/G2L SoC DTSI
> >
> >  arch/arm64/boot/dts/renesas/r9a07g044.dtsi |  254 ++---
> >  arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 1149 +++-----------------
> >  2 files changed, 256 insertions(+), 1147 deletions(-)
>
> Do you have an opinion on this series?
> Is this acceptable for you?
> The final generated DTBs are identical to before.

Given the feedback from Krzysztof and Rob on patch 1, and on IRC,
I'm rejecting this series.

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC
  2023-03-10 10:41   ` Geert Uytterhoeven
@ 2023-03-12 20:07     ` Lad, Prabhakar
  0 siblings, 0 replies; 10+ messages in thread
From: Lad, Prabhakar @ 2023-03-12 20:07 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Lad Prabhakar, Magnus Damm, linux-renesas-soc, devicetree,
	linux-kernel, Biju Das, Rob Herring, Krzysztof Kozlowski

Hi Geert,

On Fri, Mar 10, 2023 at 10:41 AM Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
>
> Hi Prabhakar,
>
> On Mon, Feb 13, 2023 at 3:16 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> > On Tue, Jan 31, 2023 at 11:42 PM Prabhakar <prabhakar.csengg@gmail.com> wrote:
> > > This series aims to reuse RZ/G2L SoC DTSI with RZ/V2L as both the SoCs are
> > > almost identical.
> > >
> > > v1 -> v2
> > > * Patch 1/2 unchanged, for patch 2/2 sorted the nodes based on the names.
> > >
> > > v1: https://patchwork.kernel.org/project/linux-renesas-soc/cover/20230127133909.144774-1-prabhakar.mahadev-lad.rj@bp.renesas.com/
> > >
> > > Cheers,
> > > Prabhakar
> > >
> > > Lad Prabhakar (2):
> > >   arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and
> > >     RESET
> > >   arm64: dts: renesas: r9a07g054: Reuse RZ/G2L SoC DTSI
> > >
> > >  arch/arm64/boot/dts/renesas/r9a07g044.dtsi |  254 ++---
> > >  arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 1149 +++-----------------
> > >  2 files changed, 256 insertions(+), 1147 deletions(-)
> >
> > Do you have an opinion on this series?
> > Is this acceptable for you?
> > The final generated DTBs are identical to before.
>
> Given the feedback from Krzysztof and Rob on patch 1, and on IRC,
> I'm rejecting this series.
>
Ok, I'll rebase CRU work by dropping this series.

Cheers,
Prabhakar

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2023-03-12 20:08 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-31 22:35 [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC Prabhakar
2023-01-31 22:35 ` [PATCH v2 1/2] arm64: dts: renesas: r9a07g044: Use SoC specific macro for CPG and RESET Prabhakar
2023-02-13 14:09   ` Geert Uytterhoeven
2023-02-13 14:51     ` Lad, Prabhakar
2023-03-08 12:56   ` Krzysztof Kozlowski
2023-01-31 22:35 ` [PATCH v2 2/2] arm64: dts: renesas: r9a07g054: Reuse RZ/G2L SoC DTSI Prabhakar
2023-02-13 14:10   ` Geert Uytterhoeven
2023-02-13 14:16 ` [PATCH v2 0/2] Share RZ/G2L SoC DTSI with RZ/V2L SoC Geert Uytterhoeven
2023-03-10 10:41   ` Geert Uytterhoeven
2023-03-12 20:07     ` Lad, Prabhakar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).