From: Jonas Karlman <jonas@kwiboo.se>
To: Kever Yang <kever.yang@rock-chips.com>,
Simon Glass <sjg@chromium.org>,
Philipp Tomsich <philipp.tomsich@vrull.eu>,
Jagan Teki <jagan@amarulasolutions.com>
Cc: u-boot@lists.denx.de, Jonas Karlman <jonas@kwiboo.se>
Subject: [PATCH 04/14] rockchip: rk3566-radxa-cm3-io: Use pinctrl for sdmmc and sdhci in SPL
Date: Sat, 22 Apr 2023 01:23:15 +0000 (UTC) [thread overview]
Message-ID: <20230422012309.402799-5-jonas@kwiboo.se> (raw)
In-Reply-To: <20230422012309.402799-1-jonas@kwiboo.se>
Enable pinctrl for sdmmc and sdhci in SPL to support loading of FIT
image from SD and eMMC storage when booting from SPI NOR flash.
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 56 ++++++++++++++++++++
configs/radxa-cm3-io-rk3566_defconfig | 3 +-
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
index a8c31fecafd8..d2ee19aaa8d5 100644
--- a/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
@@ -11,6 +11,62 @@
};
};
+&pinctrl {
+ bootph-pre-ram;
+};
+
+&pcfg_pull_up {
+ bootph-pre-ram;
+};
+
+&pcfg_pull_none {
+ bootph-pre-ram;
+};
+
+&pcfg_pull_up_drv_level_2 {
+ bootph-pre-ram;
+};
+
+&uart2m0_xfer {
+ bootph-pre-ram;
+};
+
+&sdmmc0_bus4 {
+ bootph-pre-ram;
+};
+
+&sdmmc0_clk {
+ bootph-pre-ram;
+};
+
+&sdmmc0_cmd {
+ bootph-pre-ram;
+};
+
+&sdmmc0_det {
+ bootph-pre-ram;
+};
+
+&sdmmc0_pwren {
+ bootph-pre-ram;
+};
+
+&emmc_bus8 {
+ bootph-pre-ram;
+};
+
+&emmc_clk {
+ bootph-pre-ram;
+};
+
+&emmc_cmd {
+ bootph-pre-ram;
+};
+
+&emmc_datastrobe {
+ bootph-pre-ram;
+};
+
&sdhci {
cap-mmc-highspeed;
mmc-ddr-1_8v;
diff --git a/configs/radxa-cm3-io-rk3566_defconfig b/configs/radxa-cm3-io-rk3566_defconfig
index dfaacbc8839e..dd1dd36a59b7 100644
--- a/configs/radxa-cm3-io-rk3566_defconfig
+++ b/configs/radxa-cm3-io-rk3566_defconfig
@@ -46,7 +46,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
@@ -63,6 +63,7 @@ CONFIG_ETH_DESIGNWARE=y
CONFIG_GMAC_ROCKCHIP=y
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
+CONFIG_SPL_PINCTRL=y
CONFIG_DM_PMIC=y
CONFIG_PMIC_RK8XX=y
CONFIG_REGULATOR_RK8XX=y
--
2.40.0
next prev parent reply other threads:[~2023-04-22 1:24 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-22 1:23 [PATCH 00/14] rockchip: rk35xx: Update defconfigs and enable boot from SPI NOR flash Jonas Karlman
2023-04-22 1:23 ` [PATCH 01/14] spi: rockchip_sfc: Use linux rockchip,sfc-no-dma prop Jonas Karlman
2023-05-06 9:47 ` Kever Yang
2023-04-22 1:23 ` [PATCH 02/14] rockchip: rk356x-u-boot: Add xin24m clock node to SPL Jonas Karlman
2023-05-06 9:47 ` Kever Yang
2023-04-22 1:23 ` [PATCH 03/14] rockchip: rk3566-radxa-cm3-io: Update defconfig Jonas Karlman
2023-05-06 9:47 ` Kever Yang
2023-04-22 1:23 ` Jonas Karlman [this message]
2023-05-06 9:47 ` [PATCH 04/14] rockchip: rk3566-radxa-cm3-io: Use pinctrl for sdmmc and sdhci in SPL Kever Yang
2023-04-22 1:23 ` [PATCH 05/14] rockchip: rk3568-evb: Update defconfig Jonas Karlman
2023-05-09 11:01 ` Kever Yang
2023-04-22 1:23 ` [PATCH 06/14] rockchip: rk3568-rock-3a: " Jonas Karlman
2023-05-09 11:02 ` Kever Yang
2023-04-22 1:23 ` [PATCH 07/14] rockchip: rk3568-rock-3a: Use pinctrl for sdmmc and sdhci in SPL Jonas Karlman
2023-05-09 11:02 ` Kever Yang
2023-04-22 1:23 ` [PATCH 08/14] rockchip: rk3568-rock-3a: Enable boot from SPI NOR flash Jonas Karlman
2023-05-09 11:02 ` Kever Yang
2023-04-22 1:23 ` [PATCH 09/14] rockchip: rk3588: Select DM_RESET and DM_REGULATOR_FIXED in arch Kconfig Jonas Karlman
2023-05-09 11:03 ` Kever Yang
2023-04-22 1:23 ` [PATCH 10/14] rockchip: rk3588-evb: Update defconfig Jonas Karlman
2023-05-09 11:15 ` Kever Yang
2023-04-22 1:23 ` [PATCH 11/14] rockchip: rk3588-rock-5b: " Jonas Karlman
2023-05-09 11:16 ` Kever Yang
2023-04-22 1:23 ` [PATCH 12/14] rockchip: rk3588-rock-5b: Add bootph prop to pinctrl for uart2 and sdhci Jonas Karlman
2023-05-09 11:16 ` Kever Yang
2023-04-22 1:23 ` [PATCH 13/14] rockchip: rk3588-rock-5b: Enable boot from SPI NOR flash Jonas Karlman
2023-05-09 11:16 ` Kever Yang
2023-05-16 15:06 ` Eugen Hristev
2023-05-16 17:38 ` Jonas Karlman
2023-05-16 19:13 ` Eugen Hristev
2023-05-16 21:56 ` Jonas Karlman
2023-04-22 1:23 ` [PATCH 14/14] Revert "arm: dts: rockchip: radxa-cm3-io, rock-3a: enable regulators for usb" Jonas Karlman
2023-05-09 11:17 ` Kever Yang
2023-05-09 13:24 ` [PATCH 00/14] rockchip: rk35xx: Update defconfigs and enable boot from SPI NOR flash Kever Yang
2023-05-09 14:40 ` Jonas Karlman
2023-05-10 6:48 ` Jonas Karlman
2023-05-17 2:20 ` Kever Yang
2023-05-17 9:24 ` Eugen Hristev
2023-05-10 11:45 ` Kever Yang
2023-05-15 9:44 ` Eugen Hristev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230422012309.402799-5-jonas@kwiboo.se \
--to=jonas@kwiboo.se \
--cc=jagan@amarulasolutions.com \
--cc=kever.yang@rock-chips.com \
--cc=philipp.tomsich@vrull.eu \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox