rockchip: rk3588: Update bootph props

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@kwiboo.se>
Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

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 ed15b14ea0ee6be871b8c50399fca7147bb58877..f0ef0164664e86f8389efe97455800b934ce6888 100644 (file)
--- 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,8 @@
 #include "rk3588-u-boot.dtsi"
 
 &fspim2_pins {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdhci {
@@ -12,16 +13,15 @@
 };
 
 &sfc {
-       bootph-pre-ram;
-       u-boot,spl-sfc-no-dma;
        pinctrl-names = "default";
        pinctrl-0 = <&fspim2_pins>;
        status = "okay";
 
        flash@0 {
-               bootph-pre-ram;
                compatible = "jedec,spi-nor";
                reg = <0>;
+               bootph-pre-ram;
+               bootph-some-ram;
                spi-max-frequency = <24000000>;
                spi-rx-bus-width = <4>;
                spi-tx-bus-width = <1>;

diff --git a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
index 60494bb8485f7b7f16a3f94c823ca38915661625..968385622fa5780491722b987e00af7a6e60c877 100644 (file)
--- a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
@@ -7,12 +7,11 @@
 #include "rk3588-u-boot.dtsi"
 
 &fspim1_pins {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sfc {
-       bootph-pre-ram;
-       u-boot,spl-sfc-no-dma;
        pinctrl-names = "default";
        pinctrl-0 = <&fspim1_pins>;
        #address-cells = <1>;
@@ -20,9 +19,10 @@
        status = "okay";
 
        flash@0 {
-               bootph-pre-ram;
                compatible = "jedec,spi-nor";
                reg = <0>;
+               bootph-pre-ram;
+               bootph-some-ram;
                spi-max-frequency = <24000000>;
                spi-rx-bus-width = <4>;
                spi-tx-bus-width = <1>;

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 5d5fa6ffb214d4cbd795ca7ef8f0650be42b1a15..1ab31a4ec5ab31810039e480189d373a3bb50061 100644 (file)
--- 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,8 @@
 #include "rk3588-u-boot.dtsi"
 
 &fspim1_pins {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdhci {
@@ -12,10 +13,8 @@
 };
 
 &sfc {
-       bootph-pre-ram;
-       u-boot,spl-sfc-no-dma;
-
        flash@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 9ee9dd051e32c412acec76b1f469c40b3d78c899..d6020ca790f64f8e16b27a5fcf9696c3305fbd26 100644 (file)
--- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
@@ -18,7 +18,8 @@
 };
 
 &fspim2_pins {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &pinctrl {
@@ -35,16 +36,15 @@
 };
 
 &sfc {
-       bootph-pre-ram;
-       u-boot,spl-sfc-no-dma;
        pinctrl-names = "default";
        pinctrl-0 = <&fspim2_pins>;
        status = "okay";
 
        flash@0 {
-               bootph-pre-ram;
                compatible = "jedec,spi-nor";
                reg = <0>;
+               bootph-pre-ram;
+               bootph-some-ram;
                spi-max-frequency = <24000000>;
                spi-rx-bus-width = <4>;
                spi-tx-bus-width = <1>;

diff --git a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
index ca2a684f35415f24c56579c4f89bb59759413ac5..a50bcc45f216b0e5d8d1b3dbe548f81de0149d55 100644 (file)
--- 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 6e4b97028d7cde77d86b924199cbe7e4b225a482..f51d7f30d7870d8aaa39f72d25c8a06342256f08 100644 (file)
--- a/arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi
@@ -3,7 +3,8 @@
 #include "rk3588s-u-boot.dtsi"
 
 &fspim2_pins {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdhci {
@@ -12,16 +13,15 @@
 };
 
 &sfc {
-       bootph-pre-ram;
-       u-boot,spl-sfc-no-dma;
        pinctrl-names = "default";
        pinctrl-0 = <&fspim2_pins>;
        status = "okay";
 
        flash@0 {
-               bootph-pre-ram;
                compatible = "jedec,spi-nor";
                reg = <0>;
+               bootph-pre-ram;
+               bootph-some-ram;
                spi-max-frequency = <24000000>;
                spi-rx-bus-width = <4>;
                spi-tx-bus-width = <1>;

diff --git a/arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi b/arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi
index 888d1b9c12d73dcfc5a2272d40e1a66f6a0672b9..12a92c0cba109e89067a09dfca1a7004275af4fc 100644 (file)
--- a/arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi
@@ -9,14 +9,13 @@
 };
 
 &fspim0_pins {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sfc {
-       bootph-pre-ram;
-       u-boot,spl-sfc-no-dma;
-
        flash@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 7fcbdb9692403c2fd7578db888d3048c388f945e..d3c257983ecbac9c49983abf1edfdbce676e8995 100644 (file)
--- a/arch/arm/dts/rk3588s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-u-boot.dtsi
@@ -132,31 +132,40 @@
 #endif
 
 &cru {
-       bootph-pre-ram;
+       bootph-all;
 };
 
 &emmc_bus8 {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &emmc_clk {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &emmc_cmd {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &emmc_data_strobe {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &emmc_rstnout {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &ioc {
-       bootph-pre-ram;
+       bootph-all;
+};
+
+&pcfg_pull_down {
+       bootph-all;
 };
 
 &pcfg_pull_none {
@@ -168,6 +177,11 @@
 };
 
 &pcfg_pull_up_drv_level_2 {
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&php_grf {
        bootph-all;
 };
 
@@ -181,10 +195,12 @@
 
 &scmi {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &scmi_clk {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdhci {
@@ -200,27 +216,35 @@
 };
 
 &sdmmc_bus4 {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc_clk {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc_cmd {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc_det {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&sfc {
+       u-boot,spl-sfc-no-dma;
 };
 
 &sys_grf {
-       bootph-pre-ram;
+       bootph-all;
 };
 
 &uart2 {
-       bootph-pre-ram;
+       bootph-all;
        clock-frequency = <24000000>;
 };