On 2023/3/18 00:29, Eugen Hristev wrote:

Add pinctrl driver in SPL. Do not remove pinctrl properties for SPL dtb.

Signed-off-by: Eugen Hristev eugen.hristev@collabora.com

Reviewed-by: Kever Yang kever.yang@rock-chips.com

Thanks, - Kever

---

configs/rock5b-rk3588_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig index 86acb6da4306..6ae57874c4d5 100644 --- a/configs/rock5b-rk3588_defconfig +++ b/configs/rock5b-rk3588_defconfig @@ -48,7 +48,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=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_SPL_REGMAP=y CONFIG_SPL_SYSCON=y CONFIG_SPL_CLK=y @@ -65,6 +65,7 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_SPL_PINCTRL=y CONFIG_REGULATOR_PWM=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_PWM_ROCKCHIP=y

On 4/14/23 11:55, Kever Yang wrote:

On 2023/3/18 00:29, Eugen Hristev wrote:

...

To be able to initialize the pinctrl correctly at SPL level and read u-boot proper from SD-Card, the pinctrl must be initialized.

Signed-off-by: Eugen Hristev eugen.hristev@collabora.com

Reviewed-by: Kever Yang kever.yang@rock-chips.com

Hi Kever,

The properties must be changed to bootph, I will update and send a new version.

Eugen

Thanks,

• Kever

...

---

Changes in v2:

• add u-boot,dm-spl to pull up nodes, to also setup the pull control

correctly. Also, in the loop that initializes multiple pins, only the first will be muxed as the loop will break when the pull up node is not found.

arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 26 +++++++++++++++++++++++++   1 file changed, 26 insertions(+)

diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi index e1d240baf35d..a9d506ba6515 100644 --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi @@ -124,6 +124,8 @@   };   &pinctrl { +    u-boot,dm-spl;

usb {           vcc5v0_host_en: vcc5v0-host-en {               rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; @@ -131,6 +133,30 @@       };   }; +&pcfg_pull_up_drv_level_2 { +    u-boot,dm-spl; +};

+&pcfg_pull_up { +    u-boot,dm-spl; +};

+&sdmmc_bus4 { +    u-boot,dm-spl; +};

+&sdmmc_clk { +    u-boot,dm-spl; +};

+&sdmmc_cmd { +    u-boot,dm-spl; +};

+&sdmmc_det { +    u-boot,dm-spl; +};

&usb_host0_ehci {       companion = <&usb_host0_ohci>;       phys = <&u2phy2_host>;