arm64: dts: rockchip: fix LDO_REG4 / LDO_REG7 confusion on rk3368-lion

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>
Link: https://lore.kernel.org/r/20210922230429.2162535-1-heiko@sntech.de

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
index bcd7977..6622f11 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi
@@ -144,7 +144,7 @@
        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 @@
                                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 @@
                                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>;