[PATCH 10/31] rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC
Kever Yang
kever.yang at rock-chips.com
Tue Apr 23 13:03:01 CEST 2024
On 2024/4/1 04:28, Jonas Karlman wrote:
> When RK3399 boards run SPL from eMMC and fail to load FIT from eMMC due
> to it being missing or checksum validation fails there can be a fallback
> to read FIT from SD-card. However, without proper pinctrl configuration
> reading FIT from SD-card may fail:
>
> U-Boot SPL 2024.04-rc4 (Mar 17 2024 - 22:54:45 +0000)
> Trying to boot from MMC2
> mmc_load_image_raw_sector: mmc block read error
> Trying to boot from MMC2
> mmc_load_image_raw_sector: mmc block read error
> Trying to boot from MMC1
> Card did not respond to voltage select! : -110
> mmc_init: -95, time 12
> spl: mmc init failed with error: -95
> SPL: failed to boot from all boot devices (err=-6)
> ### ERROR ### Please RESET the board ###
>
> Fix this by tagging related sdhci and sdmmc pinctrl nodes with bootph
> props. Also sort and move common nodes shared by all boards to the SoC
> u-boot.dtsi. Finally imply the SPL_DM_SEQ_ALIAS Kconfig option to enable
> it on all RK3399 boards.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/dts/rk3399-evb-u-boot.dtsi | 1 -
> arch/arm/dts/rk3399-ficus-u-boot.dtsi | 8 ++
> arch/arm/dts/rk3399-gru-u-boot.dtsi | 24 ++++++
> arch/arm/dts/rk3399-nanopi4-u-boot.dtsi | 12 +++
> arch/arm/dts/rk3399-orangepi-u-boot.dtsi | 12 +++
> arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 17 ++++-
> arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 2 -
> arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi | 19 ++---
> arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 41 ++++++----
> arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi | 8 ++
> arch/arm/dts/rk3399-rock960-u-boot.dtsi | 8 ++
> arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 17 ++++-
> arch/arm/dts/rk3399-u-boot.dtsi | 75 +++++++++++++++----
> arch/arm/mach-rockchip/Kconfig | 1 +
> configs/chromebook_bob_defconfig | 1 -
> configs/chromebook_kevin_defconfig | 1 -
> configs/eaidk-610-rk3399_defconfig | 2 +-
> configs/evb-rk3399_defconfig | 2 +-
> configs/ficus-rk3399_defconfig | 2 +-
> configs/firefly-rk3399_defconfig | 2 +-
> configs/khadas-edge-captain-rk3399_defconfig | 2 +-
> configs/khadas-edge-rk3399_defconfig | 2 +-
> configs/khadas-edge-v-rk3399_defconfig | 2 +-
> configs/leez-rk3399_defconfig | 2 +-
> configs/nanopc-t4-rk3399_defconfig | 4 +-
> configs/nanopi-m4-2gb-rk3399_defconfig | 4 +-
> configs/nanopi-m4-rk3399_defconfig | 4 +-
> configs/nanopi-m4b-rk3399_defconfig | 4 +-
> configs/nanopi-neo4-rk3399_defconfig | 4 +-
> configs/nanopi-r4s-rk3399_defconfig | 4 +-
> configs/orangepi-rk3399_defconfig | 4 +-
> configs/pinebook-pro-rk3399_defconfig | 5 +-
> configs/pinephone-pro-rk3399_defconfig | 3 +-
> configs/puma-rk3399_defconfig | 1 -
> configs/roc-pc-mezzanine-rk3399_defconfig | 4 +-
> configs/roc-pc-rk3399_defconfig | 4 +-
> configs/rock-4c-plus-rk3399_defconfig | 2 +-
> configs/rock-4se-rk3399_defconfig | 2 +-
> configs/rock-pi-4-rk3399_defconfig | 3 +-
> configs/rock-pi-4c-rk3399_defconfig | 2 +-
> configs/rock-pi-n10-rk3399pro_defconfig | 2 +-
> configs/rock960-rk3399_defconfig | 2 +-
> configs/rockpro64-rk3399_defconfig | 5 +-
> 43 files changed, 243 insertions(+), 83 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
> index 796ac9642399..9df4a02c3e74 100644
> --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
> @@ -38,7 +38,6 @@
> };
>
> &sdmmc {
> - bootph-all;
> bus-width = <4>;
> cap-mmc-highspeed;
> cap-sd-highspeed;
> diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
> index 67b63a835238..d821cabfaa67 100644
> --- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
> @@ -5,3 +5,11 @@
>
> #include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-ddr3-1600.dtsi"
> +
> +&pcfg_pull_none_18ma {
> + bootph-pre-ram;
> +};
> +
> +&pcfg_pull_up_8ma {
> + bootph-pre-ram;
> +};
> diff --git a/arch/arm/dts/rk3399-gru-u-boot.dtsi b/arch/arm/dts/rk3399-gru-u-boot.dtsi
> index b1604a6872c0..0cc40eb6d6f6 100644
> --- a/arch/arm/dts/rk3399-gru-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-gru-u-boot.dtsi
> @@ -54,6 +54,30 @@
> enable-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
> };
>
> +&sdhci {
> + /delete-property/ bootph-pre-ram;
> +};
> +
> +&sdmmc {
> + /delete-property/ bootph-pre-ram;
> +};
> +
> +&sdmmc_bus4 {
> + /delete-property/ bootph-pre-ram;
> +};
> +
> +&sdmmc_cd {
> + /delete-property/ bootph-pre-ram;
> +};
> +
> +&sdmmc_clk {
> + /delete-property/ bootph-pre-ram;
> +};
> +
> +&sdmmc_cmd {
> + /delete-property/ bootph-pre-ram;
> +};
> +
> &spi5 {
> spi-activate-delay = <100>;
> spi-max-frequency = <3000000>;
> diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
> index a126bbaf086f..e0d7a518dfc2 100644
> --- a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
> @@ -5,6 +5,18 @@
>
> #include "rk3399-u-boot.dtsi"
>
> +&gpio0 {
> + bootph-pre-ram;
> +};
> +
> &sdmmc {
> pinctrl-0 = <&sdmmc_bus4 &sdmmc_clk &sdmmc_cmd &sdmmc_cd>;
> };
> +
> +&sdmmc0_pwr_h {
> + bootph-pre-ram;
> +};
> +
> +&vcc3v0_sd {
> + bootph-pre-ram;
> +};
> diff --git a/arch/arm/dts/rk3399-orangepi-u-boot.dtsi b/arch/arm/dts/rk3399-orangepi-u-boot.dtsi
> index d4327ea607c4..b7452eca2254 100644
> --- a/arch/arm/dts/rk3399-orangepi-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-orangepi-u-boot.dtsi
> @@ -6,6 +6,18 @@
> #include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-ddr3-1333.dtsi"
>
> +&gpio0 {
> + bootph-pre-ram;
> +};
> +
> +&sdmmc0_pwr_h {
> + bootph-pre-ram;
> +};
> +
> +&vcc3v0_sd {
> + bootph-pre-ram;
> +};
> +
> &vdd_log {
> regulator-init-microvolt = <950000>;
> };
> diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> index 83b0c44e9ec5..2341db444ef3 100644
> --- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> @@ -10,18 +10,29 @@
> rockchip,panel = <&edp_panel>;
> };
>
> +&gpio0 {
> + bootph-pre-ram;
> +};
> +
> &sdhci {
> max-frequency = <25000000>;
> - bootph-all;
> };
>
> &sdmmc {
> max-frequency = <20000000>;
> - bootph-all;
> +};
> +
> +&sdmmc0_pwr_h_pin {
> + bootph-pre-ram;
> };
>
> &spiflash {
> - bootph-all;
> + bootph-pre-ram;
> + bootph-some-ram;
> +};
> +
> +&vcc3v0_sd {
> + bootph-pre-ram;
> };
>
> &vdd_log {
> diff --git a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
> index e29757590611..b8f95b86d86b 100644
> --- a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
> @@ -12,10 +12,8 @@
>
> &sdhci {
> max-frequency = <25000000>;
> - bootph-all;
> };
>
> &sdmmc {
> max-frequency = <20000000>;
> - bootph-all;
> };
> diff --git a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
> index 2b3ea6da88db..f48d395f972a 100644
> --- a/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi
> @@ -87,26 +87,27 @@
> bootph-all;
> };
>
> +&haikou_pin_hog {
> + bootph-all;
> +};
> +
> &norflash {
> - bootph-all;
> -};
> -
> -&pcfg_pull_none {
> - bootph-all;
> + bootph-pre-ram;
> + bootph-some-ram;
> };
>
> -&pcfg_pull_up {
> +&uart0 {
> bootph-all;
> };
>
> -&sdmmc_bus4 {
> +&uart0_cts {
> bootph-all;
> };
>
> -&sdmmc_clk {
> +&uart0_rts {
> bootph-all;
> };
>
> -&sdmmc_cmd {
> +&uart0_xfer {
> bootph-all;
> };
> diff --git a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
> index e390cf3abab5..aecf7dbe383c 100644
> --- a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
> @@ -32,25 +32,38 @@
> vin-supply = <&vcc_vbus_typec0>;
> };
>
> +&gpio4 {
> + bootph-pre-ram;
> +};
> +
> &spi1 {
> - spi_flash: flash at 0 {
> - bootph-all;
> + flash at 0 {
> + bootph-pre-ram;
> + bootph-some-ram;
> };
> };
>
> +&vcc3v0_sd {
> + bootph-pre-ram;
> +};
> +
> +&vcc3v0_sd_en {
> + bootph-pre-ram;
> +};
> +
> +&vcc5v0_host {
> + regulator-always-on;
> +};
> +
> +&vcc_sdio {
> + regulator-always-on;
> +};
> +
> +&vcc_sys {
> + regulator-always-on;
> +};
> +
> &vdd_log {
> regulator-min-microvolt = <430000>;
> regulator-init-microvolt = <950000>;
> };
> -
> -&vcc5v0_host {
> - regulator-always-on;
> -};
> -
> -&vcc_sys {
> - regulator-always-on;
> -};
> -
> -&vcc_sdio {
> - regulator-always-on;
> -};
> diff --git a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
> index 5c1c451b8f85..9785b97b9eea 100644
> --- a/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-rock-4c-plus-u-boot.dtsi
> @@ -3,3 +3,11 @@
> * Copyright (c) 2023 Radxa Limited
> */
> #include "rk3399-rock-pi-4-u-boot.dtsi"
> +
> +&pcfg_pull_none_18ma {
> + bootph-pre-ram;
> +};
> +
> +&pcfg_pull_up_8ma {
> + bootph-pre-ram;
> +};
> diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
> index 55716ba4df73..b1db07a107ec 100644
> --- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
> @@ -19,3 +19,11 @@
> vin-supply = <&vcc5v0_sys>;
> };
> };
> +
> +&pcfg_pull_none_18ma {
> + bootph-pre-ram;
> +};
> +
> +&pcfg_pull_up_8ma {
> + bootph-pre-ram;
> +};
> diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
> index b15e5392c3cf..43b67991fe5a 100644
> --- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
> @@ -26,8 +26,10 @@
> };
> };
> };
> +};
>
> -
> +&gpio0 {
> + bootph-pre-ram;
> };
>
> &sdhci {
> @@ -35,12 +37,21 @@
> mmc-ddr-1_8v;
> };
>
> +&sdmmc0_pwr_h {
> + bootph-pre-ram;
> +};
> +
> &spi1 {
> - spi_flash: flash at 0 {
> - bootph-all;
> + flash at 0 {
> + bootph-pre-ram;
> + bootph-some-ram;
> };
> };
>
> +&vcc3v0_sd {
> + bootph-pre-ram;
> +};
> +
> &vdd_center {
> regulator-min-microvolt = <950000>;
> regulator-max-microvolt = <950000>;
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> index fe045ca81749..69e6b808a69b 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -94,13 +94,22 @@
> };
>
> &emmc_phy {
> - bootph-all;
> + bootph-pre-ram;
> + bootph-some-ram;
> };
>
> &grf {
> bootph-all;
> };
>
> +&pcfg_pull_none {
> + bootph-all;
> +};
> +
> +&pcfg_pull_up {
> + bootph-all;
> +};
> +
> &pinctrl {
> bootph-all;
> };
> @@ -109,47 +118,81 @@
> bootph-all;
> };
>
> -&pmugrf {
> - bootph-all;
> -};
> -
> -&pmu {
> - bootph-all;
> -};
> -
> &pmucru {
> bootph-all;
> };
>
> +&pmugrf {
> + bootph-all;
> +};
> +
> &sdhci {
> + bootph-pre-ram;
> + bootph-some-ram;
> max-frequency = <200000000>;
> - bootph-all;
> +
> + /* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
> u-boot,spl-fifo-mode;
> };
>
> &sdmmc {
> - bootph-all;
> + bootph-pre-ram;
> + bootph-some-ram;
>
> /* mmc to sram can't do dma, prevent aborts transferring TF-A parts */
> u-boot,spl-fifo-mode;
> };
>
> +&sdmmc_bus4 {
> + bootph-pre-ram;
> +};
> +
> +&sdmmc_cd {
> + bootph-pre-ram;
> +};
> +
> +&sdmmc_clk {
> + bootph-pre-ram;
> +};
> +
> +&sdmmc_cmd {
> + bootph-pre-ram;
> +};
> +
> &spi1 {
> - bootph-all;
> + bootph-pre-ram;
> + bootph-some-ram;
> };
>
> -&uart0 {
> - bootph-all;
> +&spi1_clk {
> + bootph-pre-ram;
> +};
> +
> +&spi1_cs0 {
> + bootph-pre-ram;
> +};
> +
> +&spi1_rx {
> + bootph-pre-ram;
> +};
> +
> +&spi1_tx {
> + bootph-pre-ram;
> };
>
> &uart2 {
> bootph-all;
> + clock-frequency = <24000000>;
> +};
> +
> +&uart2c_xfer {
> + bootph-all;
> };
>
> &vopb {
> - bootph-all;
> + bootph-some-ram;
> };
>
> &vopl {
> - bootph-all;
> + bootph-some-ram;
> };
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index bc03d69a7f5c..1b9bfa313fc0 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -276,6 +276,7 @@ config ROCKCHIP_RK3399
> imply ROCKCHIP_COMMON_BOARD
> imply ROCKCHIP_EFUSE
> imply ROCKCHIP_SDRAM_COMMON
> + imply SPL_DM_SEQ_ALIAS
> imply SPL_FIT_SIGNATURE
> imply SPL_ROCKCHIP_COMMON_BOARD
> imply SYS_BOOTCOUNT_SINGLEWORD if BOOTCOUNT_LIMIT
> diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig
> index 6e203a6cf0e1..7022ee51e6c7 100644
> --- a/configs/chromebook_bob_defconfig
> +++ b/configs/chromebook_bob_defconfig
> @@ -61,7 +61,6 @@ CONFIG_SPL_OF_CONTROL=y
> CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_ROCKCHIP_GPIO=y
> CONFIG_I2C_CROS_EC_TUNNEL=y
> CONFIG_SYS_I2C_ROCKCHIP=y
> diff --git a/configs/chromebook_kevin_defconfig b/configs/chromebook_kevin_defconfig
> index e3d16f44d62a..57d43677eb00 100644
> --- a/configs/chromebook_kevin_defconfig
> +++ b/configs/chromebook_kevin_defconfig
> @@ -62,7 +62,6 @@ CONFIG_SPL_OF_CONTROL=y
> CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_ROCKCHIP_GPIO=y
> CONFIG_I2C_CROS_EC_TUNNEL=y
> CONFIG_SYS_I2C_ROCKCHIP=y
> diff --git a/configs/eaidk-610-rk3399_defconfig b/configs/eaidk-610-rk3399_defconfig
> index 4d8b495ccfec..eba6f90c605b 100644
> --- a/configs/eaidk-610-rk3399_defconfig
> +++ b/configs/eaidk-610-rk3399_defconfig
> @@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
> index c4936768ffb6..afb79987464f 100644
> --- a/configs/evb-rk3399_defconfig
> +++ b/configs/evb-rk3399_defconfig
> @@ -27,7 +27,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_NET_RANDOM_ETHADDR=y
> diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig
> index 3bcd0fd66b91..f4e3ebba8f46 100644
> --- a/configs/ficus-rk3399_defconfig
> +++ b/configs/ficus-rk3399_defconfig
> @@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_SYS_MMC_ENV_DEV=1
> diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
> index 8f68ffbd3a49..db98926b627a 100644
> --- a/configs/firefly-rk3399_defconfig
> +++ b/configs/firefly-rk3399_defconfig
> @@ -29,7 +29,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> diff --git a/configs/khadas-edge-captain-rk3399_defconfig b/configs/khadas-edge-captain-rk3399_defconfig
> index 310250ed4a52..230b9d796442 100644
> --- a/configs/khadas-edge-captain-rk3399_defconfig
> +++ b/configs/khadas-edge-captain-rk3399_defconfig
> @@ -27,7 +27,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_NET_RANDOM_ETHADDR=y
> diff --git a/configs/khadas-edge-rk3399_defconfig b/configs/khadas-edge-rk3399_defconfig
> index 3fe5542d1256..9f13cbf58398 100644
> --- a/configs/khadas-edge-rk3399_defconfig
> +++ b/configs/khadas-edge-rk3399_defconfig
> @@ -27,7 +27,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> diff --git a/configs/khadas-edge-v-rk3399_defconfig b/configs/khadas-edge-v-rk3399_defconfig
> index 4b41454d710d..abc4f2054cfd 100644
> --- a/configs/khadas-edge-v-rk3399_defconfig
> +++ b/configs/khadas-edge-v-rk3399_defconfig
> @@ -27,7 +27,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_NET_RANDOM_ETHADDR=y
> diff --git a/configs/leez-rk3399_defconfig b/configs/leez-rk3399_defconfig
> index 2831cfb36689..13453e523444 100644
> --- a/configs/leez-rk3399_defconfig
> +++ b/configs/leez-rk3399_defconfig
> @@ -25,7 +25,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
> index cdfacb66e678..89c36e273a9b 100644
> --- a/configs/nanopc-t4-rk3399_defconfig
> +++ b/configs/nanopc-t4-rk3399_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_SPL_GPIO=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_ENV_OFFSET=0x3F8000
> CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopc-t4"
> @@ -28,7 +29,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> @@ -42,6 +43,7 @@ CONFIG_GMAC_ROCKCHIP=y
> CONFIG_NVME_PCI=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_BAUDRATE=1500000
> diff --git a/configs/nanopi-m4-2gb-rk3399_defconfig b/configs/nanopi-m4-2gb-rk3399_defconfig
> index 51596f57ae35..eb1d2c1f51fc 100644
> --- a/configs/nanopi-m4-2gb-rk3399_defconfig
> +++ b/configs/nanopi-m4-2gb-rk3399_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_SPL_GPIO=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_ENV_OFFSET=0x3F8000
> CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4-2gb"
> @@ -25,7 +26,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> @@ -38,6 +39,7 @@ CONFIG_ETH_DESIGNWARE=y
> CONFIG_GMAC_ROCKCHIP=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_BAUDRATE=1500000
> diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
> index 2af84fb6ff17..bc0b90b3d861 100644
> --- a/configs/nanopi-m4-rk3399_defconfig
> +++ b/configs/nanopi-m4-rk3399_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_SPL_GPIO=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_ENV_OFFSET=0x3F8000
> CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4"
> @@ -25,7 +26,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> @@ -38,6 +39,7 @@ CONFIG_ETH_DESIGNWARE=y
> CONFIG_GMAC_ROCKCHIP=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_BAUDRATE=1500000
> diff --git a/configs/nanopi-m4b-rk3399_defconfig b/configs/nanopi-m4b-rk3399_defconfig
> index 1b76f98e0df7..678f4d9d823f 100644
> --- a/configs/nanopi-m4b-rk3399_defconfig
> +++ b/configs/nanopi-m4b-rk3399_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_SPL_GPIO=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_ENV_OFFSET=0x3F8000
> CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-m4b"
> @@ -25,7 +26,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> @@ -38,6 +39,7 @@ CONFIG_ETH_DESIGNWARE=y
> CONFIG_GMAC_ROCKCHIP=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_BAUDRATE=1500000
> diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
> index c176c5a12111..d9b7a90e8402 100644
> --- a/configs/nanopi-neo4-rk3399_defconfig
> +++ b/configs/nanopi-neo4-rk3399_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_SPL_GPIO=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_ENV_OFFSET=0x3F8000
> CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-neo4"
> @@ -25,7 +26,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> @@ -38,6 +39,7 @@ CONFIG_ETH_DESIGNWARE=y
> CONFIG_GMAC_ROCKCHIP=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_BAUDRATE=1500000
> diff --git a/configs/nanopi-r4s-rk3399_defconfig b/configs/nanopi-r4s-rk3399_defconfig
> index ea01d323541b..1fcccf2bae6e 100644
> --- a/configs/nanopi-r4s-rk3399_defconfig
> +++ b/configs/nanopi-r4s-rk3399_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_SPL_GPIO=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_ENV_OFFSET=0x3F8000
> CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s"
> @@ -25,7 +26,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> @@ -38,6 +39,7 @@ CONFIG_ETH_DESIGNWARE=y
> CONFIG_GMAC_ROCKCHIP=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_RAM_ROCKCHIP_LPDDR4=y
> diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig
> index c6a92b2decf3..703732ad15f0 100644
> --- a/configs/orangepi-rk3399_defconfig
> +++ b/configs/orangepi-rk3399_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_SPL_GPIO=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_ENV_OFFSET=0x3F8000
> CONFIG_DEFAULT_DEVICE_TREE="rk3399-orangepi"
> @@ -25,7 +26,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> @@ -38,6 +39,7 @@ CONFIG_ETH_DESIGNWARE=y
> CONFIG_GMAC_ROCKCHIP=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_BAUDRATE=1500000
> diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
> index e4aad1b710cb..dd8bc2b72cc3 100644
> --- a/configs/pinebook-pro-rk3399_defconfig
> +++ b/configs/pinebook-pro-rk3399_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_SPL_GPIO=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_SF_DEFAULT_SPEED=20000000
> CONFIG_ENV_SIZE=0x8000
> @@ -41,10 +42,9 @@ CONFIG_CMD_TIME=y
> CONFIG_CMD_PMIC=y
> CONFIG_CMD_REGULATOR=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_ROCKCHIP_GPIO=y
> CONFIG_SYS_I2C_ROCKCHIP=y
> CONFIG_LED=y
> @@ -72,6 +72,7 @@ CONFIG_PHY_ROCKCHIP_TYPEC=y
> CONFIG_DM_PMIC_FAN53555=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_RAM_ROCKCHIP_LPDDR4=y
> diff --git a/configs/pinephone-pro-rk3399_defconfig b/configs/pinephone-pro-rk3399_defconfig
> index 285c47d76b6e..c36898364b5d 100644
> --- a/configs/pinephone-pro-rk3399_defconfig
> +++ b/configs/pinephone-pro-rk3399_defconfig
> @@ -40,10 +40,9 @@ CONFIG_CMD_TIME=y
> CONFIG_CMD_PMIC=y
> CONFIG_CMD_REGULATOR=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_ROCKCHIP_GPIO=y
> CONFIG_SYS_I2C_ROCKCHIP=y
> CONFIG_LED=y
> diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
> index fe7aac791271..cc3d2cf3755d 100644
> --- a/configs/puma-rk3399_defconfig
> +++ b/configs/puma-rk3399_defconfig
> @@ -61,7 +61,6 @@ CONFIG_ENV_SPI_MAX_HZ=50000000
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_SYS_MMC_ENV_DEV=1
> CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_GPIO_HOG=y
> CONFIG_SPL_GPIO_HOG=y
> CONFIG_ROCKCHIP_GPIO=y
> diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig
> index 1ff4e15c8c10..e13356faabbc 100644
> --- a/configs/roc-pc-mezzanine-rk3399_defconfig
> +++ b/configs/roc-pc-mezzanine-rk3399_defconfig
> @@ -38,10 +38,9 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_ROCKCHIP_GPIO=y
> CONFIG_SYS_I2C_ROCKCHIP=y
> CONFIG_MMC_DW=y
> @@ -57,6 +56,7 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> CONFIG_PHY_ROCKCHIP_TYPEC=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> # CONFIG_RAM_ROCKCHIP_DEBUG is not set
> diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig
> index 5d6e6b17091f..dee342898d1f 100644
> --- a/configs/roc-pc-rk3399_defconfig
> +++ b/configs/roc-pc-rk3399_defconfig
> @@ -38,10 +38,9 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_ROCKCHIP_GPIO=y
> CONFIG_SYS_I2C_ROCKCHIP=y
> CONFIG_MMC_DW=y
> @@ -56,6 +55,7 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> CONFIG_PHY_ROCKCHIP_TYPEC=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> # CONFIG_RAM_ROCKCHIP_DEBUG is not set
> diff --git a/configs/rock-4c-plus-rk3399_defconfig b/configs/rock-4c-plus-rk3399_defconfig
> index 6c69e8bdcb92..2024defb2bf0 100644
> --- a/configs/rock-4c-plus-rk3399_defconfig
> +++ b/configs/rock-4c-plus-rk3399_defconfig
> @@ -34,7 +34,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
> CONFIG_CMD_EFIDEBUG=y
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_DFU_MMC=y
> diff --git a/configs/rock-4se-rk3399_defconfig b/configs/rock-4se-rk3399_defconfig
> index e5ed81022bd6..9b2303fdf792 100644
> --- a/configs/rock-4se-rk3399_defconfig
> +++ b/configs/rock-4se-rk3399_defconfig
> @@ -33,7 +33,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
> CONFIG_CMD_EFIDEBUG=y
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_DFU_MMC=y
> diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
> index 2801becedb4b..e5a2bba8e7ff 100644
> --- a/configs/rock-pi-4-rk3399_defconfig
> +++ b/configs/rock-pi-4-rk3399_defconfig
> @@ -40,10 +40,9 @@ CONFIG_CMD_USB_MASS_STORAGE=y
> CONFIG_CMD_EFIDEBUG=y
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_DFU_MMC=y
> CONFIG_ROCKCHIP_GPIO=y
> CONFIG_SYS_I2C_ROCKCHIP=y
> diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig
> index 72d37bff9e9a..4a9d1c531c10 100644
> --- a/configs/rock-pi-4c-rk3399_defconfig
> +++ b/configs/rock-pi-4c-rk3399_defconfig
> @@ -34,7 +34,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
> CONFIG_CMD_EFIDEBUG=y
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_DFU_MMC=y
> diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig
> index 6889cdcbf7d8..234d0c9ab0f5 100644
> --- a/configs/rock-pi-n10-rk3399pro_defconfig
> +++ b/configs/rock-pi-n10-rk3399pro_defconfig
> @@ -31,7 +31,7 @@ CONFIG_CMD_USB=y
> # CONFIG_CMD_SETEXPR is not set
> CONFIG_CMD_TIME=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_ROCKCHIP_GPIO=y
> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
> index 7a4a3df85b1b..3b5ab7dc5781 100644
> --- a/configs/rock960-rk3399_defconfig
> +++ b/configs/rock960-rk3399_defconfig
> @@ -33,7 +33,7 @@ CONFIG_CMD_TIME=y
> CONFIG_CMD_PMIC=y
> CONFIG_CMD_REGULATOR=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> CONFIG_SYS_MMC_ENV_DEV=1
> diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
> index 368ef7c4b5db..173f8f75020d 100644
> --- a/configs/rockpro64-rk3399_defconfig
> +++ b/configs/rockpro64-rk3399_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> +CONFIG_SPL_GPIO=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_ENV_SIZE=0x8000
> CONFIG_ENV_OFFSET=0x3F8000
> @@ -38,10 +39,9 @@ CONFIG_CMD_USB=y
> CONFIG_CMD_TIME=y
> CONFIG_CMD_BOOTSTAGE=y
> CONFIG_SPL_OF_CONTROL=y
> -CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_SPI_FLASH=y
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> -CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_SATA=y
> CONFIG_SCSI_AHCI=y
> CONFIG_AHCI_PCI=y
> @@ -65,6 +65,7 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> CONFIG_PHY_ROCKCHIP_TYPEC=y
> CONFIG_PMIC_RK8XX=y
> CONFIG_REGULATOR_PWM=y
> +CONFIG_SPL_DM_REGULATOR_FIXED=y
> CONFIG_REGULATOR_RK8XX=y
> CONFIG_PWM_ROCKCHIP=y
> CONFIG_RAM_ROCKCHIP_LPDDR4=y
More information about the U-Boot
mailing list