[PATCH v3 13/28] rockchip: rk3588: Update bootph props
Kever Yang
kever.yang at rock-chips.com
Mon Apr 22 10:02:28 CEST 2024
On 2024/4/22 14:28, Jonas Karlman wrote:
> 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 at kwiboo.se>
> Reviewed-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
Thanks,
- Kever
> ---
> v3: Split rk3588-generic.dts and evb-rk3588_defconfig changes into
> separate patches
> v3: Collect r-b tag
> v2: Add bootph-some-ram props and follow kernel sort order
>
> Following bootph props have been applied:
>
> CRU, GRF and UART nodes:
> - bootph-all - needed at all or most stages
>
> SD-card regulator related nodes:
> - bootph-pre-ram (SPL) - regulator pinctrl may be needed to read FIT
> from SD-card on some boards
>
> eMMC/SD-card/SPI flash related nodes:
> - bootph-pre-ram (SPL)
> - bootph-some-ram (U-Boot proper pre-reloc)
> ---
> .../arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi | 8 +--
> arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 12 ++---
> .../dts/rk3588-orangepi-5-plus-u-boot.dtsi | 7 ++-
> arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 8 +--
> arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi | 6 ++-
> arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi | 8 +--
> arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi | 9 ++--
> arch/arm/dts/rk3588s-u-boot.dtsi | 50 ++++++++++++++-----
> 8 files changed, 67 insertions(+), 41 deletions(-)
>
> 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 ed15b14ea0ee..f0ef0164664e 100644
> --- 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 at 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 60494bb8485f..968385622fa5 100644
> --- 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;
> -};
> -
> -&sfc {
> bootph-pre-ram;
> - u-boot,spl-sfc-no-dma;
> + bootph-some-ram;
> +};
> +
> +&sfc {
> pinctrl-names = "default";
> pinctrl-0 = <&fspim1_pins>;
> #address-cells = <1>;
> @@ -20,9 +19,10 @@
> status = "okay";
>
> flash at 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 5d5fa6ffb214..1ab31a4ec5ab 100644
> --- 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 at 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 9ee9dd051e32..d6020ca790f6 100644
> --- 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 at 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 ca2a684f3541..a50bcc45f216 100644
> --- 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 6e4b97028d7c..f51d7f30d787 100644
> --- 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 at 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 888d1b9c12d7..12a92c0cba10 100644
> --- 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;
> -};
> -
> -&sfc {
> bootph-pre-ram;
> - u-boot,spl-sfc-no-dma;
> + bootph-some-ram;
> +};
>
> +&sfc {
> flash at 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 7fcbdb969240..d3c257983ecb 100644
> --- 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>;
> };
>
More information about the U-Boot
mailing list