rockchip: rk356x: 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: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3566-pinetab2-u-boot.dtsi b/arch/arm/dts/rk3566-pinetab2-u-boot.dtsi
index 4aa6ab1..eb18008 100644 (file)
--- a/arch/arm/dts/rk3566-pinetab2-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-pinetab2-u-boot.dtsi
@@ -3,20 +3,31 @@
 #include "rk356x-u-boot.dtsi"
 
 &fspi_dual_io_pins {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &gpio0 {
-       bootph-all;
+       bootph-pre-ram;
 };
 
 &i2c0 {
        bootph-pre-ram;
 };
 
-&rk817 {
+&i2c0_xfer {
+       bootph-pre-ram;
+};
+
+&i2s1m0_mclk {
+       bootph-pre-ram;
+};
+
+&pmic_int_l {
        bootph-pre-ram;
+};
 
+&rk817 {
        regulators {
                bootph-pre-ram;
        };
@@ -27,15 +38,13 @@
 };
 
 &sdmmc_pwren_l {
-       bootph-all;
+       bootph-pre-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/rk3566-quartz64-a-u-boot.dtsi b/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
index 930d660..0e25b7e 100644 (file)
--- a/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
@@ -3,7 +3,7 @@
 #include "rk356x-u-boot.dtsi"
 
 &gpio0 {
-       bootph-all;
+       bootph-pre-ram;
 };
 
 &sdhci {
@@ -13,11 +13,9 @@
 };
 
 &sfc {
-       bootph-pre-ram;
-       u-boot,spl-sfc-no-dma;
-
        flash@0 {
                bootph-pre-ram;
+               bootph-some-ram;
        };
 };
 
@@ -34,5 +32,5 @@
 };
 
 &vcc_sd_h {
-       bootph-all;
+       bootph-pre-ram;
 };

diff --git a/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi b/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
index c235b43..f2c9d8e 100644 (file)
--- a/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
@@ -9,11 +9,9 @@
 };
 
 &sfc {
-       bootph-pre-ram;
-       u-boot,spl-sfc-no-dma;
-
        flash@0 {
                bootph-pre-ram;
+               bootph-some-ram;
        };
 };
 

diff --git a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
index 1fc71fa..d8a6dd8 100644 (file)
--- a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
@@ -3,7 +3,8 @@
 #include "rk356x-u-boot.dtsi"
 
 &fspi_dual_io_pins {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdhci {
@@ -15,10 +16,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/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
index 5b823fc..9d18f5d 100644 (file)
--- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
@@ -26,16 +26,15 @@
 };
 
 &sfc {
-       bootph-pre-ram;
-       u-boot,spl-sfc-no-dma;
        #address-cells = <1>;
        #size-cells = <0>;
        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/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi
index 8ac10f1..0a0943b 100644 (file)
--- a/arch/arm/dts/rk356x-u-boot.dtsi
+++ b/arch/arm/dts/rk356x-u-boot.dtsi
@@ -54,43 +54,46 @@
 };
 
 &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_datastrobe {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &emmc_rstnout {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &fspi_pins {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &grf {
        bootph-all;
 };
 
-&i2c0_xfer {
-       bootph-all;
-};
-
 &pcfg_pull_none {
        bootph-all;
 };
 
 &pcfg_pull_none_smt {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &pcfg_pull_up {
@@ -98,7 +101,8 @@
 };
 
 &pcfg_pull_up_drv_level_2 {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &pinctrl {
@@ -115,35 +119,46 @@
 
 &sdhci {
        bootph-pre-ram;
+       bootph-some-ram;
        max-frequency = <200000000>;
 };
 
 &sdmmc0 {
        bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc0_bus4 {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc0_clk {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc0_cmd {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc0_det {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
 };
 
 &sdmmc0_pwren {
-       bootph-all;
+       bootph-pre-ram;
+       bootph-some-ram;
+};
+
+&sfc {
+       u-boot,spl-sfc-no-dma;
 };
 
 &uart2 {
-       bootph-pre-ram;
+       bootph-all;
        clock-frequency = <24000000>;
 };