vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: rk356x: Update bootph props

Browse Source 
After the commit aca95282c1 ("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>
This commit is contained in:
Jonas Karlman
2024-04-26 15:47:04 +08:00
committed by Kever Yang
parent 647b8cf0e8
commit 63dfe0a820
6 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/dts/rk3566-pinetab2-u-boot.dtsi
+16 -7
View File
@@ -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;
};
};
arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi
+3 -5
View File
@@ -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;
};
arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi
+1 -3
View File
@@ -9,11 +9,9 @@
};
&sfc {
bootph-pre-ram;
u-boot,spl-sfc-no-dma;
flash@0 {
bootph-pre-ram;
bootph-some-ram;
};
};
arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi
+3 -4
View File
@@ -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;
};
};
arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
+2 -3
View File
@@ -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>;
arch/arm/dts/rk356x-u-boot.dtsi
+33 -18
View File
@@ -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>;
};