From: Justin Klaassen <justin@tidylabs.net>
Date: Fri, 23 May 2025 16:53:40 +0000 (+0000)
Subject: rockchip: rk3399-nanopi-4: Allow MMC driver to control SD regulators
X-Git-Tag: v2025.07-rc4~5^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2abd7fff9ebf08d51614c58e824d184ebe550404;p=pandora-u-boot.git

rockchip: rk3399-nanopi-4: Allow MMC driver to control SD regulators

This change removes the "regulator-always-on" property from the
"vcc3v0_sd" (vmmc-supply) and "vcc_sdio" (vqmmc-supply) regulators,
which otherwise prevents the MMC driver from being able to power cycle
the SD card as part of the initialization procedure.

It also removes the "regulator-boot-on" from the "vcc_sdio" regulator,
which could theoretically damage a SD card that is already initialized
in a low voltage mode.

Signed-off-by: Justin Klaassen <justin@tidylabs.net>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---

diff --git a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
index 75736124996..ba2b73223d4 100644
--- a/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-nanopi4-u-boot.dtsi
@@ -19,8 +19,11 @@
 
 &vcc3v0_sd {
 	bootph-pre-ram;
+	/delete-property/ regulator-always-on;
 };
 
 &vcc_sdio {
+	/delete-property/ regulator-always-on;
+	/delete-property/ regulator-boot-on;
 	regulator-init-microvolt = <3000000>;
 };