[PATCH 12/19] rockchip: rk3588: Update bootph props
Jonas Karlman
jonas at kwiboo.se
Fri Mar 29 20:01:53 CET 2024
After the commit aca95282c1b7 ("Makefile: Use the fdtgrep -u flag")
bootph props is propagating to parent nodes.
Update bootph props to ensure eMMC, SD-card and SPI flash is available
in SPL and U-Boot proper pre-reloc phase also remove unneeded bootph
props that automatically is propagated to parent nodes.
Also adjust pinctrl nodes to only be included in boot phases where they
are needed and add any missing pinctrl node needed in SPL.
Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
---
.../arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi | 5 ++-
arch/arm/dts/rk3588-generic.dts | 1 +
arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 9 +++--
.../dts/rk3588-orangepi-5-plus-u-boot.dtsi | 6 ++--
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 5 ++-
arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi | 6 +++-
arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi | 5 ++-
arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi | 8 ++---
arch/arm/dts/rk3588s-u-boot.dtsi | 36 ++++++++++++-------
configs/evb-rk3588_defconfig | 4 ++-
10 files changed, 48 insertions(+), 37 deletions(-)
diff --git a/arch/arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi b/arch/arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi
index ed15b14ea0ee..b1d1d79fdd1a 100644
--- a/arch/arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi
@@ -3,7 +3,7 @@
#include "rk3588-u-boot.dtsi"
&fspim2_pins {
- bootph-all;
+ bootph-pre-ram;
};
&sdhci {
@@ -12,14 +12,13 @@
};
&sfc {
- bootph-pre-ram;
- u-boot,spl-sfc-no-dma;
pinctrl-names = "default";
pinctrl-0 = <&fspim2_pins>;
status = "okay";
flash at 0 {
bootph-pre-ram;
+ bootph-some-ram;
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <24000000>;
diff --git a/arch/arm/dts/rk3588-generic.dts b/arch/arm/dts/rk3588-generic.dts
index e4721d97a87d..baafe7463f1b 100644
--- a/arch/arm/dts/rk3588-generic.dts
+++ b/arch/arm/dts/rk3588-generic.dts
@@ -40,5 +40,6 @@
};
&uart2 {
+ pinctrl-0 = <&uart2m0_xfer>;
status = "okay";
};
diff --git a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
index 60494bb8485f..a2094aff7cca 100644
--- a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
@@ -7,12 +7,10 @@
#include "rk3588-u-boot.dtsi"
&fspim1_pins {
- bootph-all;
-};
-
-&sfc {
bootph-pre-ram;
- u-boot,spl-sfc-no-dma;
+};
+
+&sfc {
pinctrl-names = "default";
pinctrl-0 = <&fspim1_pins>;
#address-cells = <1>;
@@ -21,6 +19,7 @@
flash at 0 {
bootph-pre-ram;
+ bootph-some-ram;
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <24000000>;
diff --git a/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi b/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
index 5d5fa6ffb214..3f42d26517fd 100644
--- a/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
@@ -3,7 +3,7 @@
#include "rk3588-u-boot.dtsi"
&fspim1_pins {
- bootph-all;
+ bootph-pre-ram;
};
&sdhci {
@@ -12,10 +12,8 @@
};
&sfc {
- bootph-pre-ram;
- u-boot,spl-sfc-no-dma;
-
flash at 0 {
bootph-pre-ram;
+ bootph-some-ram;
};
};
diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
index 9ee9dd051e32..448432bad4ff 100644
--- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
@@ -18,7 +18,7 @@
};
&fspim2_pins {
- bootph-all;
+ bootph-pre-ram;
};
&pinctrl {
@@ -35,14 +35,13 @@
};
&sfc {
- bootph-pre-ram;
- u-boot,spl-sfc-no-dma;
pinctrl-names = "default";
pinctrl-0 = <&fspim2_pins>;
status = "okay";
flash at 0 {
bootph-pre-ram;
+ bootph-some-ram;
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <24000000>;
diff --git a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
index ca2a684f3541..a50bcc45f216 100644
--- a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
@@ -12,6 +12,10 @@
};
&uart9 {
- bootph-pre-ram;
+ bootph-all;
clock-frequency = <24000000>;
};
+
+&uart9m0_xfer {
+ bootph-all;
+};
diff --git a/arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi b/arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi
index 6e4b97028d7c..0f4b38f63d59 100644
--- a/arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi
@@ -3,7 +3,7 @@
#include "rk3588s-u-boot.dtsi"
&fspim2_pins {
- bootph-all;
+ bootph-pre-ram;
};
&sdhci {
@@ -12,14 +12,13 @@
};
&sfc {
- bootph-pre-ram;
- u-boot,spl-sfc-no-dma;
pinctrl-names = "default";
pinctrl-0 = <&fspim2_pins>;
status = "okay";
flash at 0 {
bootph-pre-ram;
+ bootph-some-ram;
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <24000000>;
diff --git a/arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi b/arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi
index 888d1b9c12d7..e0e9ddef0aec 100644
--- a/arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi
@@ -9,14 +9,12 @@
};
&fspim0_pins {
- bootph-all;
-};
-
-&sfc {
bootph-pre-ram;
- u-boot,spl-sfc-no-dma;
+};
+&sfc {
flash at 0 {
bootph-pre-ram;
+ bootph-some-ram;
};
};
diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
index e4171bd24d2a..a502a82fae6a 100644
--- a/arch/arm/dts/rk3588s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-u-boot.dtsi
@@ -121,31 +121,35 @@
};
&cru {
- bootph-pre-ram;
+ bootph-all;
};
&emmc_bus8 {
- bootph-all;
+ bootph-pre-ram;
};
&emmc_clk {
- bootph-all;
+ bootph-pre-ram;
};
&emmc_cmd {
- bootph-all;
+ bootph-pre-ram;
};
&emmc_data_strobe {
- bootph-all;
+ bootph-pre-ram;
};
&emmc_rstnout {
- bootph-all;
+ bootph-pre-ram;
};
&ioc {
- bootph-pre-ram;
+ bootph-all;
+};
+
+&pcfg_pull_down {
+ bootph-all;
};
&pcfg_pull_none {
@@ -157,6 +161,10 @@
};
&pcfg_pull_up_drv_level_2 {
+ bootph-pre-ram;
+};
+
+&php_grf {
bootph-all;
};
@@ -189,19 +197,23 @@
};
&sdmmc_bus4 {
- bootph-all;
+ bootph-pre-ram;
};
&sdmmc_clk {
- bootph-all;
+ bootph-pre-ram;
};
&sdmmc_cmd {
- bootph-all;
+ bootph-pre-ram;
};
&sdmmc_det {
- bootph-all;
+ bootph-pre-ram;
+};
+
+&sfc {
+ u-boot,spl-sfc-no-dma;
};
&sys_grf {
@@ -209,7 +221,7 @@
};
&uart2 {
- bootph-pre-ram;
+ bootph-all;
clock-frequency = <24000000>;
};
diff --git a/configs/evb-rk3588_defconfig b/configs/evb-rk3588_defconfig
index 68ecbc54b807..610a8d740fbb 100644
--- a/configs/evb-rk3588_defconfig
+++ b/configs/evb-rk3588_defconfig
@@ -33,7 +33,8 @@ CONFIG_CMD_REGULATOR=y
# CONFIG_SPL_DOS_PARTITION is not set
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_LIVE=y
-CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_SPL_REGMAP=y
CONFIG_SPL_SYSCON=y
CONFIG_SPL_CLK=y
@@ -52,6 +53,7 @@ CONFIG_DWC_ETH_QOS_ROCKCHIP=y
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
CONFIG_PHY_ROCKCHIP_USBDP=y
+CONFIG_SPL_PINCTRL=y
CONFIG_PWM_ROCKCHIP=y
CONFIG_SPL_RAM=y
CONFIG_BAUDRATE=1500000
--
2.43.2
More information about the U-Boot
mailing list