diff mbox series

[1/3] arm64: dts: rockchip: fix LDO_REG4 / LDO_REG7 confusion on rk3368-lion

Message ID 20210922230429.2162535-1-heiko@sntech.de (mailing list archive)
State New, archived
Headers show
Series [1/3] arm64: dts: rockchip: fix LDO_REG4 / LDO_REG7 confusion on rk3368-lion | expand

Commit Message

Heiko Stuebner Sept. 22, 2021, 11:04 p.m. UTC
From: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>

LDO_REG7 is used for generating VCC_18.
LDO_REG4 is not connected to anything - delete it.

Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

Comments

Heiko Stuebner Sept. 23, 2021, 10:24 p.m. UTC | #1
On Thu, 23 Sep 2021 01:04:27 +0200, Heiko Stuebner wrote:
> LDO_REG7 is used for generating VCC_18.
> LDO_REG4 is not connected to anything - delete it.

Applied, thanks!

[1/3] arm64: dts: rockchip: fix LDO_REG4 / LDO_REG7 confusion on rk3368-lion
      commit: 3bd7f3ef3b0f34aefcd09e2e834bbee868179b09
[2/3] arm64: dts: rockchip: define iodomains for rk3368-lion
      commit: 0ed6b51dfde601c8b815a81aab701cd8965c5b12
[3/3] arm64: dts: rockchip: add phandles to muxed i2c buses on rk3368-lion
      commit: 5a73d7ca7f7a64144e03ef0fc8eb6f8e5ea54df3

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
index bcd7977fb0f8..6622f11a169f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
@@ -144,7 +144,7 @@  &emmc {
 	mmc-hs200-1_8v;
 	non-removable;
 	vmmc-supply = <&vcc33_io>;
-	vqmmc-supply = <&vcc18_io>;
+	vqmmc-supply = <&vcc_18>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_bus8>;
 	status = "okay";
@@ -238,13 +238,6 @@  vdd10_pll: LDO_REG3 {
 				regulator-boot-on;
 			};
 
-			vcc18_io: LDO_REG4 {
-				regulator-name = "vcc18_io";
-				regulator-min-microvolt = <1800000>;
-				regulator-max-microvolt = <1800000>;
-				regulator-boot-on;
-			};
-
 			vdd10_video: LDO_REG6 {
 				regulator-name = "vdd10_video";
 				regulator-min-microvolt = <1000000>;
@@ -253,6 +246,14 @@  vdd10_video: LDO_REG6 {
 				regulator-boot-on;
 			};
 
+			vcc_18: LDO_REG7 {
+				regulator-always-on;
+				regulator-boot-on;
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-name = "vcc_18";
+			};
+
 			vcc18_video: LDO_REG8 {
 				regulator-name = "vcc18_video";
 				regulator-min-microvolt = <1800000>;