Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

rockchip: rk3588: 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: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Jonas Karlman
2024-04-22 06:28:50 +00:00
committed by Kever Yang
parent 63dfe0a820
commit bcaf6c0570
8 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi
View File

@@ -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>;

8
arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
View File

@@ -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>;

7
arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
View File

@@ -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;
};
};

8
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
View File

@@ -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>;

6
arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
View File

@@ -12,6 +12,10 @@
};
&uart9 {
bootph-pre-ram;
bootph-all;
clock-frequency = <24000000>;
};
&uart9m0_xfer {
bootph-all;
};

8
arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi
View File

@@ -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>;

7
arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi
View File

@@ -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;
};
};

50
arch/arm/dts/rk3588s-u-boot.dtsi
View File

@@ -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>;
};