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/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi
index 8ac10f1..0a0943b4 100644
--- 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>;
};