Skip to contentSkip to conversation

ARM: dts: rk3588-rock-5b-u-boot: add bootph-all to pinctrl for sdmmc

PATCH In review Eugen Hristev 2 participants 4 messages May 15, 2023 – May 17, 2023 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/2 ARM: dts: rk3588-rock-5b-u-boot: add bootph-all to pinctrl for sdmmc

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

---
Changes in v4:
- rebased on latest master: This is also on top of the USB 2.0 series ! Changes in v3:
- change to bootph-all props.

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(+)
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +26 -0
index 53d029c60e8f..e9fcb7b92eb3 100644
@@ -31,6 +31,8 @@
 };
 
 &pinctrl {
+	bootph-all;
+
 	usb {
 		vcc5v0_host_en: vcc5v0-host-en {
 			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -38,11 +40,35 @@
 	};
 };
 
+&pcfg_pull_up_drv_level_2 {
+	bootph-all;
+};
+
+&pcfg_pull_up {
+	bootph-all;
+};
+
 &sdmmc {
 	bus-width = <4>;
 	status = "okay";
 };
 
+&sdmmc_bus4 {
+	bootph-all;
+};
+
+&sdmmc_clk {
+	bootph-all;
+};
+
+&sdmmc_cmd {
+	bootph-all;
+};
+
+&sdmmc_det {
+	bootph-all;
+};
+
 &sdhci {
 	cap-mmc-highspeed;
 	mmc-ddr-1_8v;
Signature · 1 line
2.34.1
#1 lore raw

PATCH v4 2/2 configs: rockchip: rock5b-rk3588: add pinctrl to SPL

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

---
Changes in v4:
- rebased on master: Warning ! This is rebased on top of the USB 2.0 series ! Changes in v2,v3:
- no change

 configs/rock5b-rk3588_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
configs/rock5b-rk3588_defconfig +2 -1
index 8a3d356f729e..95271c312c51 100644
@@ -47,7 +47,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_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SPL_SYSCON=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
Signature · 1 line
2.34.1
Reviewed-by on v4 1/2
#3 lore raw
In reply to Eugen Hristev
Quoted 4 lines · Eugen Hristev

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

Thanks,
- Kever

Quoted 64 lines

---
Changes in v4:
- rebased on latest master: This is also on top of the USB 2.0 series ! Changes in v3:
- change to bootph-all props.

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(+)
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +26 -0
index 53d029c60e8f..e9fcb7b92eb3 100644
@@ -31,6 +31,8 @@
  };
 
  &pinctrl {
+	bootph-all;
+
  	usb {
  		vcc5v0_host_en: vcc5v0-host-en {
  			rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -38,11 +40,35 @@
  	};
  };
 
+&pcfg_pull_up_drv_level_2 {
+	bootph-all;
+};
+
+&pcfg_pull_up {
+	bootph-all;
+};
+
  &sdmmc {
  	bus-width = <4>;
  	status = "okay";
  };
 
+&sdmmc_bus4 {
+	bootph-all;
+};
+
+&sdmmc_clk {
+	bootph-all;
+};
+
+&sdmmc_cmd {
+	bootph-all;
+};
+
+&sdmmc_det {
+	bootph-all;
+};
+
  &sdhci {
  	cap-mmc-highspeed;
  	mmc-ddr-1_8v;
Reviewed-by on v4 2/2
#2 lore raw

Re: [PATCH v4 2/2] configs: rockchip: rock5b-rk3588: add pinctrl to SPL

In reply to Eugen Hristev
Quoted 3 lines · Eugen Hristev

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

Thanks,
- Kever

Quoted 30 lines

---
Changes in v4:
- rebased on master: Warning ! This is rebased on top of the USB 2.0 series ! Changes in v2,v3:
- no change

  configs/rock5b-rk3588_defconfig | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
configs/rock5b-rk3588_defconfig +2 -1
index 8a3d356f729e..95271c312c51 100644
@@ -47,7 +47,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_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_REGMAP=y
  CONFIG_SPL_SYSCON=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