| From 5b31dcf8d73e861b4e7b274efd9d1ca668ca5e42 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 19 Jun 2021 14:13:06 +0200 |
| Subject: arm64: dts: rockchip: Re-add regulator-always-on for vcc_sdio for |
| rk3399-roc-pc |
| |
| From: Alex Bee <knaerzche@gmail.com> |
| |
| [ 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> |
| --- |
| arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| 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>; |
| -- |
| 2.30.2 |
| |
