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 7573612..ba2b732 100644 (file)
--- 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>;
 };