summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Bee <knaerzche@gmail.com>2021-06-19 14:13:06 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-20 16:02:27 +0200
commitfcfa9adc8b9a0ebb589ce7fcf96e12da58d0f1a1 (patch)
treec709c2ddc4e80ac34bb11b7c881983e9adcebb01
parent94784eeae3acf602a026489b9863b609a5d18be3 (diff)
downloadlinux-stable-fcfa9adc8b9a0ebb589ce7fcf96e12da58d0f1a1.tar.gz
linux-stable-fcfa9adc8b9a0ebb589ce7fcf96e12da58d0f1a1.tar.bz2
linux-stable-fcfa9adc8b9a0ebb589ce7fcf96e12da58d0f1a1.zip
arm64: dts: rockchip: Re-add regulator-always-on for vcc_sdio for rk3399-roc-pc
[ Upstream commit eb607cd4957fb0ef97beb2a8293478be6a54240a ] Re-add the regulator-always-on property for vcc_sdio which supplies sdmmc, since it gets disabled during reboot now and the bootrom expects it to be enabled when booting from SD card. This makes rebooting impossible in that case and requires a hard reset to boot again. Fixes: 04a0077fdb19 ("arm64: dts: rockchip: Remove always-on properties from regulator nodes on rk3399-roc-pc.") Signed-off-by: Alex Bee <knaerzche@gmail.com> Link: https://lore.kernel.org/r/20210619121306.7740-1-knaerzche@gmail.com Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
index e4345e5bdfb6..35b7ab3bf10c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
@@ -384,6 +384,7 @@
vcc_sdio: LDO_REG4 {
regulator-name = "vcc_sdio";
+ regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>;