[PATCH] arm: dts: renesas: Clean up RPC DT nodes

Marek Vasut marek.vasut+renesas at mailbox.org
Mon Apr 20 03:21:10 CEST 2026


Remove duplicate properties which are present both in arch/arm/dts/
and upstream dts/upstream/src/arm64/renesas/ in favor of those in
upstream DTs. Since those are duplicates, this causes no functional
change. Remove unused num-cs and bank-width DT properties.

Signed-off-by: Marek Vasut <marek.vasut+renesas at mailbox.org>
---
Cc: Adam Ford <aford173 at gmail.com>
Cc: Khanh Le <khanh.le.xr at renesas.com>
Cc: Nguyen Tran <nguyen.tran.pz at bp.renesas.com>
Cc: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Cc: Tom Rini <trini at konsulko.com>
Cc: u-boot at lists.denx.de
---
 arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi    |  1 -
 arch/arm/dts/r8a774c0-ek874-u-boot.dtsi       |  1 -
 arch/arm/dts/r8a774c0-u-boot.dtsi             | 12 -----------
 arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi  |  5 -----
 arch/arm/dts/r8a77951-u-boot.dtsi             | 12 -----------
 arch/arm/dts/r8a77951-ulcb-u-boot.dtsi        |  5 -----
 arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi  |  5 -----
 arch/arm/dts/r8a77960-u-boot.dtsi             | 12 -----------
 arch/arm/dts/r8a77960-ulcb-u-boot.dtsi        |  5 -----
 arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi  |  5 -----
 arch/arm/dts/r8a77965-u-boot.dtsi             | 12 -----------
 arch/arm/dts/r8a77965-ulcb-u-boot.dtsi        |  5 -----
 arch/arm/dts/r8a77970-eagle-u-boot.dtsi       |  3 ---
 arch/arm/dts/r8a77970-u-boot.dtsi             | 18 -----------------
 arch/arm/dts/r8a77970-v3msk-u-boot.dtsi       |  3 ---
 arch/arm/dts/r8a77980-condor-u-boot.dtsi      |  4 ----
 arch/arm/dts/r8a77980-u-boot.dtsi             | 18 -----------------
 arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi       |  4 ----
 arch/arm/dts/r8a77990-ebisu-u-boot.dtsi       |  7 -------
 arch/arm/dts/r8a77990-u-boot.dtsi             | 18 -----------------
 arch/arm/dts/r8a77995-draak-u-boot.dtsi       |  7 -------
 arch/arm/dts/r8a77995-u-boot.dtsi             | 18 -----------------
 arch/arm/dts/r8a779a0-falcon-u-boot.dtsi      |  4 ----
 arch/arm/dts/r8a779a0-u-boot.dtsi             | 19 ------------------
 arch/arm/dts/r8a779g0-u-boot.dtsi             |  5 -----
 .../dts/r8a779h0-gray-hawk-single-u-boot.dtsi | 20 -------------------
 arch/arm/dts/r8a779h0-u-boot.dtsi             | 11 ----------
 arch/arm/dts/rz-g2-beacon-u-boot.dtsi         |  1 -
 28 files changed, 240 deletions(-)
 delete mode 100644 arch/arm/dts/r8a77970-u-boot.dtsi
 delete mode 100644 arch/arm/dts/r8a77980-u-boot.dtsi
 delete mode 100644 arch/arm/dts/r8a77990-u-boot.dtsi
 delete mode 100644 arch/arm/dts/r8a77995-u-boot.dtsi
 delete mode 100644 arch/arm/dts/r8a779a0-u-boot.dtsi
 delete mode 100644 arch/arm/dts/r8a779h0-u-boot.dtsi

diff --git a/arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi b/arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi
index 34fba29e859..9a30425bdad 100644
--- a/arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi
+++ b/arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi
@@ -49,7 +49,6 @@
 		compatible = "renesas,r7s72100-rpc-if";
 		reg = <0x3fefa000 0x100>, <0x18000000 0x08000000>;
 		bank-width = <2>;
-		num-cs = <1>;
 		status = "okay";
 		spi-max-frequency = <50000000>;
 		#address-cells = <1>;
diff --git a/arch/arm/dts/r8a774c0-ek874-u-boot.dtsi b/arch/arm/dts/r8a774c0-ek874-u-boot.dtsi
index dcdddd9aed6..9a77e242af2 100644
--- a/arch/arm/dts/r8a774c0-ek874-u-boot.dtsi
+++ b/arch/arm/dts/r8a774c0-ek874-u-boot.dtsi
@@ -14,7 +14,6 @@
 };
 
 &rpc {
-	num-cs = <1>;
 	status = "okay";
 	spi-max-frequency = <50000000>;
 	#address-cells = <1>;
diff --git a/arch/arm/dts/r8a774c0-u-boot.dtsi b/arch/arm/dts/r8a774c0-u-boot.dtsi
index 17b863d23c9..d7b98783196 100644
--- a/arch/arm/dts/r8a774c0-u-boot.dtsi
+++ b/arch/arm/dts/r8a774c0-u-boot.dtsi
@@ -6,18 +6,6 @@
  *
  */
 
-/ {
-	soc {
-		rpc: spi at ee200000 {
-			compatible = "renesas,r8a774c0-rpc-if", "renesas,rcar-gen3-rpc-if";
-			reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-			clocks = <&cpg CPG_MOD 917>;
-			bank-width = <2>;
-			status = "disabled";
-		};
-	};
-};
-
 /delete-node/ &can0;
 /delete-node/ &can1;
 /delete-node/ &canfd;
diff --git a/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi
index d88e839a890..a162173b493 100644
--- a/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi
+++ b/arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi
@@ -23,11 +23,6 @@
 	};
 };
 
-&rpc {
-	reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-	status = "disabled";
-};
-
 &sdhi0 {
 	sd-uhs-sdr12;
 	sd-uhs-sdr25;
diff --git a/arch/arm/dts/r8a77951-u-boot.dtsi b/arch/arm/dts/r8a77951-u-boot.dtsi
index 13760f3d5d4..e8a7fa27a76 100644
--- a/arch/arm/dts/r8a77951-u-boot.dtsi
+++ b/arch/arm/dts/r8a77951-u-boot.dtsi
@@ -5,18 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut at gmail.com>
  */
 
-/ {
-	soc {
-		rpc: spi at ee200000 {
-			compatible = "renesas,r8a7795-rpc-if", "renesas,rcar-gen3-rpc-if";
-			reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-			clocks = <&cpg CPG_MOD 917>;
-			bank-width = <2>;
-			status = "disabled";
-		};
-	};
-};
-
 /delete-node/ &ak4613;
 /delete-node/ &audma0;
 /delete-node/ &audma1;
diff --git a/arch/arm/dts/r8a77951-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77951-ulcb-u-boot.dtsi
index 8269d967af9..81bf715d300 100644
--- a/arch/arm/dts/r8a77951-ulcb-u-boot.dtsi
+++ b/arch/arm/dts/r8a77951-ulcb-u-boot.dtsi
@@ -32,11 +32,6 @@
 	};
 };
 
-&rpc {
-	reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-	status = "disabled";
-};
-
 &sdhi0 {
 	sd-uhs-sdr12;
 	sd-uhs-sdr25;
diff --git a/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi
index 0a1602cdd23..3c90e2a87ad 100644
--- a/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi
+++ b/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi
@@ -23,11 +23,6 @@
 	};
 };
 
-&rpc {
-	reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-	status = "disabled";
-};
-
 &sdhi0 {
 	sd-uhs-sdr12;
 	sd-uhs-sdr25;
diff --git a/arch/arm/dts/r8a77960-u-boot.dtsi b/arch/arm/dts/r8a77960-u-boot.dtsi
index 9cc0d52f634..b437792a172 100644
--- a/arch/arm/dts/r8a77960-u-boot.dtsi
+++ b/arch/arm/dts/r8a77960-u-boot.dtsi
@@ -5,18 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut at gmail.com>
  */
 
-/ {
-	soc {
-		rpc: spi at ee200000 {
-			compatible = "renesas,r8a7796-rpc-if", "renesas,rcar-gen3-rpc-if";
-			reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-			clocks = <&cpg CPG_MOD 917>;
-			bank-width = <2>;
-			status = "disabled";
-		};
-	};
-};
-
 /delete-node/ &ak4613;
 /delete-node/ &audma0;
 /delete-node/ &audma1;
diff --git a/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi
index d2a0406be17..2cc222d756a 100644
--- a/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi
+++ b/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi
@@ -32,11 +32,6 @@
 	};
 };
 
-&rpc {
-	reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-	status = "disabled";
-};
-
 &sdhi0 {
 	sd-uhs-sdr12;
 	sd-uhs-sdr25;
diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi b/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi
index 518466aca35..3ad407f022e 100644
--- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi
@@ -23,11 +23,6 @@
 	};
 };
 
-&rpc {
-	reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-	status = "disabled";
-};
-
 &sdhi0 {
 	sd-uhs-sdr12;
 	sd-uhs-sdr25;
diff --git a/arch/arm/dts/r8a77965-u-boot.dtsi b/arch/arm/dts/r8a77965-u-boot.dtsi
index 3cf32d84ca0..57382e34912 100644
--- a/arch/arm/dts/r8a77965-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-u-boot.dtsi
@@ -5,18 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut at gmail.com>
  */
 
-/ {
-	soc {
-		rpc: spi at ee200000 {
-			compatible = "renesas,r8a77965-rpc-if", "renesas,rcar-gen3-rpc-if";
-			reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-			clocks = <&cpg CPG_MOD 917>;
-			bank-width = <2>;
-			status = "disabled";
-		};
-	};
-};
-
 /delete-node/ &ak4613;
 /delete-node/ &audma0;
 /delete-node/ &audma1;
diff --git a/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi b/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi
index 3905bf4e4f7..ce715f61976 100644
--- a/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi
+++ b/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi
@@ -32,11 +32,6 @@
 	};
 };
 
-&rpc {
-	reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-	status = "disabled";
-};
-
 &sdhi0 {
 	sd-uhs-sdr12;
 	sd-uhs-sdr25;
diff --git a/arch/arm/dts/r8a77970-eagle-u-boot.dtsi b/arch/arm/dts/r8a77970-eagle-u-boot.dtsi
index c7971b9e9ce..b18ec9a695d 100644
--- a/arch/arm/dts/r8a77970-eagle-u-boot.dtsi
+++ b/arch/arm/dts/r8a77970-eagle-u-boot.dtsi
@@ -5,7 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut at gmail.com>
  */
 
-#include "r8a77970-u-boot.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
 / {
@@ -34,9 +33,7 @@
 };
 
 &rpc {
-	num-cs = <1>;
 	status = "okay";
-	spi-max-frequency = <50000000>;
 	#address-cells = <1>;
 	#size-cells = <0>;
 
diff --git a/arch/arm/dts/r8a77970-u-boot.dtsi b/arch/arm/dts/r8a77970-u-boot.dtsi
deleted file mode 100644
index d00ef2f3105..00000000000
--- a/arch/arm/dts/r8a77970-u-boot.dtsi
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A77970 SoC
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut at gmail.com>
- */
-
-/ {
-	soc {
-		rpc: spi at ee200000 {
-			compatible = "renesas,r8a77970-rpc-if", "renesas,rcar-gen3-rpc-if";
-			reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-			clocks = <&cpg CPG_MOD 917>;
-			bank-width = <2>;
-			status = "disabled";
-		};
-	};
-};
diff --git a/arch/arm/dts/r8a77970-v3msk-u-boot.dtsi b/arch/arm/dts/r8a77970-v3msk-u-boot.dtsi
index c7b2e07793d..e5352a663f4 100644
--- a/arch/arm/dts/r8a77970-v3msk-u-boot.dtsi
+++ b/arch/arm/dts/r8a77970-v3msk-u-boot.dtsi
@@ -5,7 +5,6 @@
  * Copyright (C) 2019 Cogent Embedded, Inc.
  */
 
-#include "r8a77970-u-boot.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
 / {
@@ -45,9 +44,7 @@
 };
 
 &rpc {
-	num-cs = <1>;
 	status = "okay";
-	spi-max-frequency = <50000000>;
 	#address-cells = <1>;
 	#size-cells = <0>;
 
diff --git a/arch/arm/dts/r8a77980-condor-u-boot.dtsi b/arch/arm/dts/r8a77980-condor-u-boot.dtsi
index 382bfe8cacd..34acdb1717c 100644
--- a/arch/arm/dts/r8a77980-condor-u-boot.dtsi
+++ b/arch/arm/dts/r8a77980-condor-u-boot.dtsi
@@ -5,8 +5,6 @@
  * Copyright (C) 2019 Marek Vasut <marek.vasut at gmail.com>
  */
 
-#include "r8a77980-u-boot.dtsi"
-
 / {
 	aliases {
 		spi0 = &rpc;
@@ -28,9 +26,7 @@
 };
 
 &rpc {
-	num-cs = <1>;
 	status = "okay";
-	spi-max-frequency = <50000000>;
 	#address-cells = <1>;
 	#size-cells = <0>;
 
diff --git a/arch/arm/dts/r8a77980-u-boot.dtsi b/arch/arm/dts/r8a77980-u-boot.dtsi
deleted file mode 100644
index df862978cba..00000000000
--- a/arch/arm/dts/r8a77980-u-boot.dtsi
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A77980 SoC
- *
- * Copyright (C) 2019 Marek Vasut <marek.vasut at gmail.com>
- */
-
-/ {
-	soc {
-		rpc: spi at ee200000 {
-			compatible = "renesas,r8a77980-rpc-if", "renesas,rcar-gen3-rpc-if";
-			reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-			clocks = <&cpg CPG_MOD 917>;
-			bank-width = <2>;
-			status = "disabled";
-		};
-	};
-};
diff --git a/arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi b/arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi
index 2901d0e7b57..2a4bd2e5fdf 100644
--- a/arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi
+++ b/arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi
@@ -5,8 +5,6 @@
  * Copyright (C) 2019 Cogent Embedded, Inc.
  */
 
-#include "r8a77980-u-boot.dtsi"
-
 / {
 	aliases {
 		spi0 = &rpc;
@@ -14,9 +12,7 @@
 };
 
 &rpc {
-	num-cs = <1>;
 	status = "okay";
-	spi-max-frequency = <50000000>;
 	#address-cells = <1>;
 	#size-cells = <0>;
 
diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi b/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi
index a52c5de4ddf..91b9a20a042 100644
--- a/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi
+++ b/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi
@@ -5,8 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut at gmail.com>
  */
 
-#include "r8a77990-u-boot.dtsi"
-
 / {
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
@@ -33,11 +31,6 @@
 	};
 };
 
-&rpc {
-	reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-	status = "disabled";
-};
-
 &sdhi0 {
 	sd-uhs-sdr12;
 	sd-uhs-sdr25;
diff --git a/arch/arm/dts/r8a77990-u-boot.dtsi b/arch/arm/dts/r8a77990-u-boot.dtsi
deleted file mode 100644
index d9dcce00e90..00000000000
--- a/arch/arm/dts/r8a77990-u-boot.dtsi
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A77990 SoC
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut at gmail.com>
- */
-
-/ {
-	soc {
-		rpc: spi at ee200000 {
-			compatible = "renesas,r8a77990-rpc-if", "renesas,rcar-gen3-rpc-if";
-			reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-			clocks = <&cpg CPG_MOD 917>;
-			bank-width = <2>;
-			status = "disabled";
-		};
-	};
-};
diff --git a/arch/arm/dts/r8a77995-draak-u-boot.dtsi b/arch/arm/dts/r8a77995-draak-u-boot.dtsi
index 19d19542efd..d0dd06f08bf 100644
--- a/arch/arm/dts/r8a77995-draak-u-boot.dtsi
+++ b/arch/arm/dts/r8a77995-draak-u-boot.dtsi
@@ -5,8 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut at gmail.com>
  */
 
-#include "r8a77995-u-boot.dtsi"
-
 / {
 	sysinfo {
 		compatible = "renesas,rcar-sysinfo";
@@ -22,8 +20,3 @@
 		bootph-all;
 	};
 };
-
-&rpc {
-	reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-	status = "disabled";
-};
diff --git a/arch/arm/dts/r8a77995-u-boot.dtsi b/arch/arm/dts/r8a77995-u-boot.dtsi
deleted file mode 100644
index 85fccbabfb3..00000000000
--- a/arch/arm/dts/r8a77995-u-boot.dtsi
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A77995 SoC
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut at gmail.com>
- */
-
-/ {
-	soc {
-		rpc: spi at ee200000 {
-			compatible = "renesas,r8a77995-rpc-if", "renesas,rcar-gen3-rpc-if";
-			reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
-			clocks = <&cpg CPG_MOD 917>;
-			bank-width = <2>;
-			status = "disabled";
-		};
-	};
-};
diff --git a/arch/arm/dts/r8a779a0-falcon-u-boot.dtsi b/arch/arm/dts/r8a779a0-falcon-u-boot.dtsi
index 3b8a017cb41..c1d92d2d9bb 100644
--- a/arch/arm/dts/r8a779a0-falcon-u-boot.dtsi
+++ b/arch/arm/dts/r8a779a0-falcon-u-boot.dtsi
@@ -5,8 +5,6 @@
  * Copyright (C) 2020 Renesas Electronics Corp.
  */
 
-#include "r8a779a0-u-boot.dtsi"
-
 / {
 	aliases {
 		spi0 = &rpc;
@@ -16,8 +14,6 @@
 &rpc {
 	#address-cells = <1>;
 	#size-cells = <0>;
-	num-cs = <1>;
-	spi-max-frequency = <50000000>;
 	status = "okay";
 
 	flash at 0 {
diff --git a/arch/arm/dts/r8a779a0-u-boot.dtsi b/arch/arm/dts/r8a779a0-u-boot.dtsi
deleted file mode 100644
index a4e75a67dc3..00000000000
--- a/arch/arm/dts/r8a779a0-u-boot.dtsi
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A779A0 SoC
- *
- * Copyright (C) 2020 Renesas Electronics Corp.
- */
-
-/ {
-	soc {
-		rpc: spi at ee200000 {
-			compatible = "renesas,r8a779a0-rpc-if", "renesas,rcar-gen3-rpc-if";
-			reg = <0 0xee200000 0 0x200>, <0 0x08000000 0 0x04000000>;
-			clocks = <&cpg CPG_MOD 629>;
-			bank-width = <2>;
-			num-cs = <1>;
-			status = "disabled";
-		};
-	};
-};
diff --git a/arch/arm/dts/r8a779g0-u-boot.dtsi b/arch/arm/dts/r8a779g0-u-boot.dtsi
index bd6a3d0713f..5a2d1fe66ce 100644
--- a/arch/arm/dts/r8a779g0-u-boot.dtsi
+++ b/arch/arm/dts/r8a779g0-u-boot.dtsi
@@ -93,11 +93,6 @@
 	bootph-all;
 };
 
-&rpc {
-	bank-width = <2>;
-	num-cs = <1>;
-};
-
 &soc {
 	apmu at e6170000 {	/* Remoteproc */
 		compatible = "renesas,r8a779g0-cr52";
diff --git a/arch/arm/dts/r8a779h0-gray-hawk-single-u-boot.dtsi b/arch/arm/dts/r8a779h0-gray-hawk-single-u-boot.dtsi
index c04d2ae2be4..f9c419b11d7 100644
--- a/arch/arm/dts/r8a779h0-gray-hawk-single-u-boot.dtsi
+++ b/arch/arm/dts/r8a779h0-gray-hawk-single-u-boot.dtsi
@@ -5,36 +5,16 @@
  * Copyright (C) 2025 Renesas Electronics Corp.
  */
 
-#include "r8a779h0-u-boot.dtsi"
-
 / {
 	aliases {
 		spi0 = &rpc;
 	};
 };
 
-&pfc {
-	qspi0_pins: qspi0 {
-		groups = "qspi0_ctrl", "qspi0_data4";
-		function = "qspi0";
-	};
-};
-
 &rpc {
-	pinctrl-0 = <&qspi0_pins>;
-	pinctrl-names = "default";
-
-	#address-cells = <1>;
-	#size-cells = <0>;
-	spi-max-frequency = <40000000>;
 	status = "disabled";
 
 	flash at 0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "s25fs512s", "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <40000000>;
 		spi-tx-bus-width = <1>;
 		spi-rx-bus-width = <1>;
 	};
diff --git a/arch/arm/dts/r8a779h0-u-boot.dtsi b/arch/arm/dts/r8a779h0-u-boot.dtsi
deleted file mode 100644
index 40e070be9a8..00000000000
--- a/arch/arm/dts/r8a779h0-u-boot.dtsi
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A779H0 SoC
- *
- * Copyright (C) 2025 Renesas Electronics Corp.
- */
-
-&rpc {
-	bank-width = <2>;
-	num-cs = <1>;
-};
diff --git a/arch/arm/dts/rz-g2-beacon-u-boot.dtsi b/arch/arm/dts/rz-g2-beacon-u-boot.dtsi
index 84416fceaff..97c4d4d292a 100644
--- a/arch/arm/dts/rz-g2-beacon-u-boot.dtsi
+++ b/arch/arm/dts/rz-g2-beacon-u-boot.dtsi
@@ -47,7 +47,6 @@
 &rpc {
 	pinctrl-0 = <&qspi_pins>;
 	pinctrl-names = "default";
-	num-cs = <1>;
 	spi-max-frequency = <40000000>;
 	#address-cells = <1>;
 	#size-cells = <0>;
-- 
2.53.0



More information about the U-Boot mailing list