]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
ARM: dts: renesas: Drop most of bootph-* tags
authorMarek Vasut <marek.vasut+renesas@mailbox.org>
Sun, 8 Jun 2025 19:04:14 +0000 (21:04 +0200)
committerMarek Vasut <marek.vasut+renesas@mailbox.org>
Wed, 18 Jun 2025 13:08:52 +0000 (15:08 +0200)
The bootph-* tags are now part of mainline Linux DTs as commits:
f1a1268572cc ("ARM: dts: renesas: rcar-gen2: Add boot phase tags")
399f14ff6625 ("arm64: dts: renesas: rcar: Add boot phase tags")
624b2a23d46a ("arm64: dts: renesas: rzg2: Add boot phase tags")
Drop local duplicates of the same tags, as well as duplicate
property assignments which are part of the core DTs themselves.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
32 files changed:
arch/arm/dts/r8a774a1-hihope-rzg2m-ex-u-boot.dtsi [deleted file]
arch/arm/dts/r8a774a1-u-boot.dtsi [deleted file]
arch/arm/dts/r8a774b1-hihope-rzg2n-ex-u-boot.dtsi [deleted file]
arch/arm/dts/r8a774b1-u-boot.dtsi [deleted file]
arch/arm/dts/r8a774c0-u-boot.dtsi
arch/arm/dts/r8a774e1-hihope-rzg2h-ex-u-boot.dtsi [deleted file]
arch/arm/dts/r8a774e1-u-boot.dtsi [deleted file]
arch/arm/dts/r8a7790-lager-u-boot.dtsi
arch/arm/dts/r8a7790-stout-u-boot.dtsi
arch/arm/dts/r8a7790-u-boot.dtsi [deleted file]
arch/arm/dts/r8a7791-koelsch-u-boot.dtsi
arch/arm/dts/r8a7791-porter-u-boot.dtsi
arch/arm/dts/r8a7791-u-boot.dtsi [deleted file]
arch/arm/dts/r8a7792-blanche-u-boot.dtsi [deleted file]
arch/arm/dts/r8a7792-u-boot.dtsi [deleted file]
arch/arm/dts/r8a7793-gose-u-boot.dtsi
arch/arm/dts/r8a7793-u-boot.dtsi [deleted file]
arch/arm/dts/r8a7794-alt-u-boot.dtsi
arch/arm/dts/r8a7794-silk-u-boot.dtsi
arch/arm/dts/r8a7794-u-boot.dtsi [deleted file]
arch/arm/dts/r8a77951-u-boot.dtsi
arch/arm/dts/r8a77960-u-boot.dtsi
arch/arm/dts/r8a77965-u-boot.dtsi
arch/arm/dts/r8a77970-u-boot.dtsi
arch/arm/dts/r8a77980-u-boot.dtsi
arch/arm/dts/r8a77990-u-boot.dtsi
arch/arm/dts/r8a77995-u-boot.dtsi
arch/arm/dts/r8a779a0-u-boot.dtsi
arch/arm/dts/r8a779f0-u-boot.dtsi
arch/arm/dts/r8a779g0-u-boot.dtsi
arch/arm/dts/r8a779x-rcar64-u-boot.dtsi [deleted file]
arch/arm/dts/r8a779x-u-boot.dtsi [deleted file]

diff --git a/arch/arm/dts/r8a774a1-hihope-rzg2m-ex-u-boot.dtsi b/arch/arm/dts/r8a774a1-hihope-rzg2m-ex-u-boot.dtsi
deleted file mode 100644 (file)
index dd5a208..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot for the Hihope RZ/G2M board
- *
- * Copyright (C) 2021-2024 Renesas Electronics Corporation
- */
-
-#include "r8a774a1-u-boot.dtsi"
diff --git a/arch/arm/dts/r8a774a1-u-boot.dtsi b/arch/arm/dts/r8a774a1-u-boot.dtsi
deleted file mode 100644 (file)
index bd91a96..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on RZ/G2 R8A774A1 SoC
- *
- * Copyright (C) 2021 Renesas Electronics Corporation
- */
-
-#include "r8a779x-rcar64-u-boot.dtsi"
diff --git a/arch/arm/dts/r8a774b1-hihope-rzg2n-ex-u-boot.dtsi b/arch/arm/dts/r8a774b1-hihope-rzg2n-ex-u-boot.dtsi
deleted file mode 100644 (file)
index b378cab..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot for the Hihope RZ/G2N board
- *
- * Copyright (C) 2021-2024 Renesas Electronics Corp.
- */
-
-#include "r8a774b1-u-boot.dtsi"
diff --git a/arch/arm/dts/r8a774b1-u-boot.dtsi b/arch/arm/dts/r8a774b1-u-boot.dtsi
deleted file mode 100644 (file)
index 38a82f0..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on RZ/G2 R8A774B1 SoC
- *
- * Copyright (C) 2021 Renesas Electronics Corp.
- */
-
-#include "r8a779x-rcar64-u-boot.dtsi"
index 4572c22f6c16fb16dca23862e6bafd70949907fd..17b863d23c9dc04bf69b831160f51c4f6de1c56c 100644 (file)
@@ -6,8 +6,6 @@
  *
  */
 
-#include "r8a779x-u-boot.dtsi"
-
 / {
        soc {
                rpc: spi@ee200000 {
diff --git a/arch/arm/dts/r8a774e1-hihope-rzg2h-ex-u-boot.dtsi b/arch/arm/dts/r8a774e1-hihope-rzg2h-ex-u-boot.dtsi
deleted file mode 100644 (file)
index 560bea4..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot for the Hihope RZ/G2H board
- *
- * Copyright (C) 2020-2024 Renesas Electronics Corp.
- */
-
-#include "r8a774e1-u-boot.dtsi"
diff --git a/arch/arm/dts/r8a774e1-u-boot.dtsi b/arch/arm/dts/r8a774e1-u-boot.dtsi
deleted file mode 100644 (file)
index f314b2b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on RZ/G2 R8A774E1 SoC
- *
- * Copyright (C) 2020 Renesas Electronics Corp.
- */
-
-#include "r8a779x-rcar64-u-boot.dtsi"
index ed1891706ceab74d696f96464ca466002d179cc9..2b18e2e6af46ebf366f5f413b714775ac106b30e 100644 (file)
@@ -5,12 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a7790-u-boot.dtsi"
-
-&scif0 {
-       bootph-all;
-};
-
 &qspi {
        flash@0 {
                spi-tx-bus-width = <1>;
index 3b393045e36df32e241967a62e68a04cefa42dad..788432bc590554784c8552d8f72d8b17f95d4927 100644 (file)
@@ -5,12 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a7790-u-boot.dtsi"
-
-&scifa0 {
-       bootph-all;
-};
-
 &qspi {
        flash@0 {
                spi-tx-bus-width = <1>;
diff --git a/arch/arm/dts/r8a7790-u-boot.dtsi b/arch/arm/dts/r8a7790-u-boot.dtsi
deleted file mode 100644 (file)
index 2a7d76b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A7790 SoC
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
- */
-
-#include "r8a779x-u-boot.dtsi"
-
-&usb_extal_clk {
-       bootph-all;
-};
-
-&pfc {
-       bootph-all;
-};
-
-&rst {
-       bootph-all;
-};
index 541c4191d69150b4f6b59dab088f368a566206a8..ed258d55e58d795cf9f213437b36ae65b7a925c8 100644 (file)
@@ -5,12 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a7791-u-boot.dtsi"
-
-&scif0 {
-       bootph-all;
-};
-
 &qspi {
        flash@0 {
                spi-tx-bus-width = <1>;
index cbf2c5265d882b0399204cef768f1930cbd933d7..cb80842f326c552e985d7b841ea28455eaf01304 100644 (file)
@@ -5,20 +5,13 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a7791-u-boot.dtsi"
-
-&scif0 {
-       bootph-all;
-};
-
-&i2c6 {
-       status = "okay";
-       clock-frequency = <400000>;
-};
-
 &qspi {
        flash@0 {
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <1>;
        };
 };
+
+&i2c6 {
+       clock-frequency = <400000>;
+};
diff --git a/arch/arm/dts/r8a7791-u-boot.dtsi b/arch/arm/dts/r8a7791-u-boot.dtsi
deleted file mode 100644 (file)
index bb0e2fd..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A7791 SoC
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
- */
-
-#include "r8a779x-u-boot.dtsi"
-
-&usb_extal_clk {
-       bootph-all;
-};
-
-&pfc {
-       bootph-all;
-};
-
-&rst {
-       bootph-all;
-};
diff --git a/arch/arm/dts/r8a7792-blanche-u-boot.dtsi b/arch/arm/dts/r8a7792-blanche-u-boot.dtsi
deleted file mode 100644 (file)
index 8c36a3e..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot for the Blanche board
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
- */
-
-#include "r8a7792-u-boot.dtsi"
-
-&iic3 {
-       status = "okay";
-};
-
-&scif0 {
-       bootph-all;
-};
diff --git a/arch/arm/dts/r8a7792-u-boot.dtsi b/arch/arm/dts/r8a7792-u-boot.dtsi
deleted file mode 100644 (file)
index ebbdcb7..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A7792 SoC
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
- */
-
-#include "r8a779x-u-boot.dtsi"
-
-&pfc {
-       bootph-all;
-};
-
-&rst {
-       bootph-all;
-};
index 41c4361c6e16aec54ddeb54b6d27882f0ac9d6db..fd99e0ffe76cfdcd38f62231c1e699e16f68354a 100644 (file)
@@ -5,12 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a7793-u-boot.dtsi"
-
-&scif0 {
-       bootph-all;
-};
-
 &qspi {
        flash@0 {
                spi-tx-bus-width = <1>;
diff --git a/arch/arm/dts/r8a7793-u-boot.dtsi b/arch/arm/dts/r8a7793-u-boot.dtsi
deleted file mode 100644 (file)
index 08f2248..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A7793 SoC
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
- */
-
-#include "r8a779x-u-boot.dtsi"
-
-&usb_extal_clk {
-       bootph-all;
-};
-
-&pfc {
-       bootph-all;
-};
-
-&rst {
-       bootph-all;
-};
index e156b4c93c7448f41da67dc324c2c3d9438dd812..fea7138a1c1d80e7fa63fb47ae5728129080fe89 100644 (file)
@@ -5,48 +5,9 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a7794-u-boot.dtsi"
-
-&i2c7 {
-       status = "okay";
-       clock-frequency = <100000>;
-};
-
-&pci0 {
-       status = "okay";
-       pinctrl-0 = <&usb0_pins>;
-       pinctrl-names = "default";
-};
-
-&pci1 {
-       status = "okay";
-       pinctrl-0 = <&usb1_pins>;
-       pinctrl-names = "default";
-};
-
-&pfc {
-       usb0_pins: usb0 {
-               groups = "usb0";
-               function = "usb0";
-       };
-
-       usb1_pins: usb1 {
-               groups = "usb1";
-               function = "usb1";
-       };
-};
-
-&scif2 {
-       bootph-all;
-};
-
 &qspi {
        flash@0 {
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <1>;
        };
 };
-
-&usbphy {
-       status = "okay";
-};
index e448ea7e146e664a2425eeaf5c6f419d5c0fd949..f87d04b0ae0a81fc362926820dae5ade5e87a165 100644 (file)
@@ -5,12 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a7794-u-boot.dtsi"
-
-&scif2 {
-       bootph-all;
-};
-
 &qspi {
        flash@0 {
                spi-tx-bus-width = <1>;
diff --git a/arch/arm/dts/r8a7794-u-boot.dtsi b/arch/arm/dts/r8a7794-u-boot.dtsi
deleted file mode 100644 (file)
index 303afae..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car R8A7794 SoC
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
- */
-
-#include "r8a779x-u-boot.dtsi"
-
-&usb_extal_clk {
-       bootph-all;
-};
-
-&pfc {
-       bootph-all;
-};
-
-&rst {
-       bootph-all;
-};
index 768d633ded053ef8c9ada97b9b8a341520029a3d..13760f3d5d42addc98a56f11125f5bb6529b5ca9 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a779x-rcar64-u-boot.dtsi"
-
 / {
        soc {
                rpc: spi@ee200000 {
index db062f8e8c7480c5599068969452aa05a8376ad7..9cc0d52f6346f6d8f02a4875abaaf011cc9ea1ec 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a779x-rcar64-u-boot.dtsi"
-
 / {
        soc {
                rpc: spi@ee200000 {
index d67e94e318b5aa62af92572af8bb0786ae4456aa..3cf32d84ca0716f7e9ab7404c6784a88d6f839bb 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a779x-rcar64-u-boot.dtsi"
-
 / {
        soc {
                rpc: spi@ee200000 {
index 8dfa56c2f13ad402a17e34fff1f607339a8af307..d00ef2f3105b70da4dfe7cf650f95bb620031117 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a779x-rcar64-u-boot.dtsi"
-
 / {
        soc {
                rpc: spi@ee200000 {
index 088839907c2957c387bd345acaac9e0ec0078f50..df862978cba5fdf326d5cf436198cb9f05690fe2 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2019 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a779x-rcar64-u-boot.dtsi"
-
 / {
        soc {
                rpc: spi@ee200000 {
index b701f68db81cd8d1e75d6b6b3e898d2e408880ea..d9dcce00e909257103536f09bc9612e38a44d1b4 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a779x-u-boot.dtsi"
-
 / {
        soc {
                rpc: spi@ee200000 {
index f4bafb6d08869940667c14c20ebca6c8730c1df1..85fccbabfb371b051170b687e545f62eecc012dc 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
  */
 
-#include "r8a779x-u-boot.dtsi"
-
 / {
        soc {
                rpc: spi@ee200000 {
index f506a6665187a496b771abc602dd3518086c9818..a4e75a67dc3025455142c4e0f01451e8915e924c 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2020 Renesas Electronics Corp.
  */
 
-#include "r8a779x-rcar64-u-boot.dtsi"
-
 / {
        soc {
                rpc: spi@ee200000 {
index 08d32fef2b98d2b2cacaf5b4954fa8f8b790d3d7..a7ff4eb708ac4f33df523d0325f69b3c30ec36d8 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2021 Renesas Electronics Corp.
  */
 
-#include "r8a779x-rcar64-u-boot.dtsi"
-
 / {
        soc {
                rpc: spi@ee200000 {
index cc9d99b0f34f4f8793c78c2a797bc91be2b2a424..5aa61314834ad3e8a6c8444c98ca303d0ee5dc10 100644 (file)
@@ -5,8 +5,6 @@
  * Copyright (C) 2021 Renesas Electronics Corp.
  */
 
-#include "r8a779x-rcar64-u-boot.dtsi"
-
 / {
        binman: binman {
                multiple-images;
        };
 };
 
-&cpg {
-       bootph-all;
-};
-
-&hscif0 {
-       bootph-all;
-};
-
 &hscif0_pins {
        bootph-all;
 };
        bootph-all;
 };
 
-&pfc {
-       bootph-all;
-};
-
 &rpc {
        bank-width = <2>;
        num-cs = <1>;
 };
 
-&rst {
-       bootph-all;
-};
-
 &soc {
        apmu@e6170000 { /* Remoteproc */
                compatible = "renesas,r8a779g0-cr52";
diff --git a/arch/arm/dts/r8a779x-rcar64-u-boot.dtsi b/arch/arm/dts/r8a779x-rcar64-u-boot.dtsi
deleted file mode 100644 (file)
index b59cc7d..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car 64bit SoC
- *
- * Copyright (C) 2024 Marek Vasut <marek.vasut+renesas@mailbox.org>
- */
-
-#include "r8a779x-u-boot.dtsi"
-
-&extalr_clk {
-       bootph-all;
-};
diff --git a/arch/arm/dts/r8a779x-u-boot.dtsi b/arch/arm/dts/r8a779x-u-boot.dtsi
deleted file mode 100644 (file)
index d1441f1..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Device Tree Source extras for U-Boot on R-Car Gen3
- *
- * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
- */
-
-/ {
-       soc {
-               bootph-all;
-       };
-};
-
-&cpg {
-       bootph-all;
-};
-
-&extal_clk {
-       bootph-all;
-};
-
-&prr {
-       bootph-all;
-};