]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
arm: dts: renesas: Clean up RPC DT nodes
authorMarek Vasut <marek.vasut+renesas@mailbox.org>
Mon, 20 Apr 2026 01:21:10 +0000 (03:21 +0200)
committerMarek Vasut <marek.vasut+renesas@mailbox.org>
Tue, 5 May 2026 10:53:53 +0000 (12:53 +0200)
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@mailbox.org>
28 files changed:
arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi
arch/arm/dts/r8a774c0-ek874-u-boot.dtsi
arch/arm/dts/r8a774c0-u-boot.dtsi
arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi
arch/arm/dts/r8a77951-u-boot.dtsi
arch/arm/dts/r8a77951-ulcb-u-boot.dtsi
arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi
arch/arm/dts/r8a77960-u-boot.dtsi
arch/arm/dts/r8a77960-ulcb-u-boot.dtsi
arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi
arch/arm/dts/r8a77965-u-boot.dtsi
arch/arm/dts/r8a77965-ulcb-u-boot.dtsi
arch/arm/dts/r8a77970-eagle-u-boot.dtsi
arch/arm/dts/r8a77970-u-boot.dtsi [deleted file]
arch/arm/dts/r8a77970-v3msk-u-boot.dtsi
arch/arm/dts/r8a77980-condor-u-boot.dtsi
arch/arm/dts/r8a77980-u-boot.dtsi [deleted file]
arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi
arch/arm/dts/r8a77990-ebisu-u-boot.dtsi
arch/arm/dts/r8a77990-u-boot.dtsi [deleted file]
arch/arm/dts/r8a77995-draak-u-boot.dtsi
arch/arm/dts/r8a77995-u-boot.dtsi [deleted file]
arch/arm/dts/r8a779a0-falcon-u-boot.dtsi
arch/arm/dts/r8a779a0-u-boot.dtsi [deleted file]
arch/arm/dts/r8a779g0-u-boot.dtsi
arch/arm/dts/r8a779h0-gray-hawk-single-u-boot.dtsi
arch/arm/dts/r8a779h0-u-boot.dtsi [deleted file]
arch/arm/dts/rz-g2-beacon-u-boot.dtsi

index 34fba29e859c0a12ed47cdfa4ea56d47a65b2290..9a30425bdadcf8cb467645e369f338d387f72d76 100644 (file)
@@ -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>;
index dcdddd9aed66f3ce0ff9e19ce334ac0eeab2e8a1..9a77e242af252c159ce0ae4cfcc9ae4e3b2f7127 100644 (file)
@@ -14,7 +14,6 @@
 };
 
 &rpc {
-       num-cs = <1>;
        status = "okay";
        spi-max-frequency = <50000000>;
        #address-cells = <1>;
index 17b863d23c9dc04bf69b831160f51c4f6de1c56c..d7b98783196895f8de4bb09ca47b86e3d8bdb388 100644 (file)
@@ -6,18 +6,6 @@
  *
  */
 
-/ {
-       soc {
-               rpc: spi@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;
index d88e839a890862c9569dbc50d84e24abaff26bf6..a162173b4934c6d55ee7462f8500cb47c3804b91 100644 (file)
        };
 };
 
-&rpc {
-       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-       status = "disabled";
-};
-
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;
index 13760f3d5d42addc98a56f11125f5bb6529b5ca9..e8a7fa27a7644870045a1b75aa3a2497604b1f03 100644 (file)
@@ -5,18 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-/ {
-       soc {
-               rpc: spi@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;
index 8269d967af9e9c0277525c13488ae188782b2b81..81bf715d300fd20705576c95013e52bbc021afd6 100644 (file)
        };
 };
 
-&rpc {
-       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-       status = "disabled";
-};
-
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;
index 0a1602cdd2364bd74c4db5db55b967f6baf451b0..3c90e2a87adef070a9902a45446a9d8a94f8d426 100644 (file)
        };
 };
 
-&rpc {
-       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-       status = "disabled";
-};
-
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;
index 9cc0d52f6346f6d8f02a4875abaaf011cc9ea1ec..b437792a1726a8d23d50eca217241848564f9aa2 100644 (file)
@@ -5,18 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-/ {
-       soc {
-               rpc: spi@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;
index d2a0406be17b4d2ba2b4ef60c386d0b32a411f94..2cc222d756a6bd4790e7f2d05c650a8b13445d93 100644 (file)
        };
 };
 
-&rpc {
-       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-       status = "disabled";
-};
-
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;
index 518466aca358d90e15e91c321d75f97acd39f5be..3ad407f022e8ac15fc4bbb5f78d9dda67e173165 100644 (file)
        };
 };
 
-&rpc {
-       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-       status = "disabled";
-};
-
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;
index 3cf32d84ca0716f7e9ab7404c6784a88d6f839bb..57382e3491247af98d6120127ae0b31bb436572f 100644 (file)
@@ -5,18 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-/ {
-       soc {
-               rpc: spi@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;
index 3905bf4e4f7ccb6f421a8d50648b409f709af1bd..ce715f61976b45c4d2225324745013d43725a0f9 100644 (file)
        };
 };
 
-&rpc {
-       reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
-       status = "disabled";
-};
-
 &sdhi0 {
        sd-uhs-sdr12;
        sd-uhs-sdr25;
index c7971b9e9ce0915b9ddfc649ccd876aa5564b744..b18ec9a695d09c782e389fd3a1d8c8b898f9a283 100644 (file)
@@ -5,7 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@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 (file)
index d00ef2f..0000000
+++ /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@gmail.com>
- */
-
-/ {
-       soc {
-               rpc: spi@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";
-               };
-       };
-};
index c7b2e07793d27c9a4b6d6b4638987d88f02cc33d..e5352a663f49d9ca817feaf0710c27bc89eefea5 100644 (file)
@@ -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>;
 
index 382bfe8cacd698ff274900db07aac9b0e69a711c..34acdb1717c4d64033892b9009fb3779748ba22d 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2019 Marek Vasut <marek.vasut@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 (file)
index df86297..0000000
+++ /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@gmail.com>
- */
-
-/ {
-       soc {
-               rpc: spi@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";
-               };
-       };
-};
index 2901d0e7b57e60a1cc13380b40b8b8729ce1fd81..2a4bd2e5fdfe057fa73006123433858aafb9841a 100644 (file)
@@ -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>;
 
index a52c5de4ddf4771c4245b094c37d9c8bf2222c28..91b9a20a042275cd125af5a4696fde75d8eba5aa 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a77990-u-boot.dtsi"
-
 / {
        sysinfo {
                compatible = "renesas,rcar-sysinfo";
        };
 };
 
-&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 (file)
index d9dcce0..0000000
+++ /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@gmail.com>
- */
-
-/ {
-       soc {
-               rpc: spi@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";
-               };
-       };
-};
index 19d19542efd687f61c1ab1b1892e9d08e0774e75..d0dd06f08bf4b063098ebc626dafe6fa7f90d52e 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@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 (file)
index 85fccba..0000000
+++ /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@gmail.com>
- */
-
-/ {
-       soc {
-               rpc: spi@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";
-               };
-       };
-};
index 3b8a017cb41d40fb7452d298069db9e25cd3f83e..c1d92d2d9bb8a1e33f3f409730178da12b169d7a 100644 (file)
@@ -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@0 {
diff --git a/arch/arm/dts/r8a779a0-u-boot.dtsi b/arch/arm/dts/r8a779a0-u-boot.dtsi
deleted file mode 100644 (file)
index a4e75a6..0000000
+++ /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@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";
-               };
-       };
-};
index bd6a3d0713f32b46699a07d95a94b3828f02dac2..5a2d1fe66ceb72868e7bb204985acbeb6697bd16 100644 (file)
        bootph-all;
 };
 
-&rpc {
-       bank-width = <2>;
-       num-cs = <1>;
-};
-
 &soc {
        apmu@e6170000 { /* Remoteproc */
                compatible = "renesas,r8a779g0-cr52";
index c04d2ae2be46608c32c447443c7839449f28ac22..f9c419b11d71c0c4653711200a6dae21e7a379a1 100644 (file)
@@ -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@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 (file)
index 40e070b..0000000
+++ /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>;
-};
index 84416fceaffb82237eda9fce27aaf85da0ac13ec..97c4d4d292a32ec14f00c486fe10f117629b4a32 100644 (file)
@@ -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>;