From 7031224000a03e62ae4ae4f8228cbdd10339f5a7 Mon Sep 17 00:00:00 2001
From: Eugen Hristev <eugen.hristev@collabora.com>
Date: Tue, 4 Jul 2023 22:05:11 +0300
Subject: [PATCH] ARM: dts: rockchip: rk3588: Move bootph-all props to common
file
Move bootph-all prop to common SoC dt file, because they are typically used
by multiple boards.
Unreferenced nodes are removed from the SPL device tree during a
normal build.
Suggested-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 54 ------------------------
arch/arm/dts/rk3588s-u-boot.dtsi | 56 +++++++++++++++++++++++++
2 files changed, 56 insertions(+), 54 deletions(-)
diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
index 549b242be0..1b2fcbb0bb 100644
--- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
@@ -76,26 +76,6 @@
status = "okay";
};
-&emmc_bus8 {
- bootph-all;
-};
-
-&emmc_clk {
- bootph-all;
-};
-
-&emmc_cmd {
- bootph-all;
-};
-
-&emmc_data_strobe {
- bootph-all;
-};
-
-&emmc_rstnout {
- bootph-all;
-};
-
&fspim2_pins {
bootph-all;
};
@@ -108,8 +88,6 @@
};
&pinctrl {
- bootph-all;
-
pcie {
pcie_reset_h: pcie-reset-h {
rockchip,pins = <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -138,39 +116,11 @@
};
};
-&pcfg_pull_none {
- bootph-all;
-};
-
-&pcfg_pull_up_drv_level_2 {
- bootph-all;
-};
-
-&pcfg_pull_up {
- bootph-all;
-};
-
&sdmmc {
bus-width = <4>;
status = "okay";
};
-&sdmmc_bus4 {
- bootph-all;
-};
-
-&sdmmc_clk {
- bootph-all;
-};
-
-&sdmmc_cmd {
- bootph-all;
-};
-
-&sdmmc_det {
- bootph-all;
-};
-
&sdhci {
cap-mmc-highspeed;
mmc-ddr-1_8v;
@@ -198,10 +148,6 @@
};
};
-&uart2m0_xfer {
- bootph-all;
-};
-
&usb_host0_ehci {
companion = <&usb_host0_ohci>;
phys = <&u2phy2_host>;
diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
index 489c5edd62..245bc8b27c 100644
--- a/arch/arm/dts/rk3588s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-u-boot.dtsi
@@ -311,6 +311,42 @@
};
};
+&emmc_bus8 {
+ bootph-all;
+};
+
+&emmc_clk {
+ bootph-all;
+};
+
+&emmc_cmd {
+ bootph-all;
+};
+
+&emmc_data_strobe {
+ bootph-all;
+};
+
+&emmc_rstnout {
+ bootph-all;
+};
+
+&pinctrl {
+ bootph-all;
+};
+
+&pcfg_pull_none {
+ bootph-all;
+};
+
+&pcfg_pull_up_drv_level_2 {
+ bootph-all;
+};
+
+&pcfg_pull_up {
+ bootph-all;
+};
+
&xin24m {
bootph-all;
status = "okay";
@@ -344,12 +380,32 @@
u-boot,spl-fifo-mode;
};
+&sdmmc_bus4 {
+ bootph-all;
+};
+
+&sdmmc_clk {
+ bootph-all;
+};
+
+&sdmmc_cmd {
+ bootph-all;
+};
+
+&sdmmc_det {
+ bootph-all;
+};
+
&uart2 {
clock-frequency = <24000000>;
bootph-pre-ram;
status = "okay";
};
+&uart2m0_xfer {
+ bootph-all;
+};
+
&ioc {
bootph-pre-ram;
};
--
2.39.5