arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf from rock-5b

Regulator for VCC3V3_WF has been added as vcc3v3_pcie2x1l0 first. Clean this up.

Fixes: 1c9a53ff7ece ("arm64: dts: rockchip: Add sdio node to rock-5b")
Signed-off-by: Tamás Szűcs <tszucs@protonmail.ch>
Link: https://lore.kernel.org/r/20231011181757.58047-1-tszucs@protonmail.ch
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 8618887899d9874059ec4b9502e7b4bbddea89ea..392ac783c3ad66943ecc5d597fade0c19e1d7df2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -114,21 +114,6 @@
                regulator-max-microvolt = <1100000>;
                vin-supply = <&vcc5v0_sys>;
        };
-
-       vcc3v3_wf: vcc3v3-wf-regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "vcc3v3_wf";
-               regulator-always-on;
-               regulator-boot-on;
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               enable-active-high;
-               gpios = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&vcc3v3_wf_en>;
-               startup-delay-us = <50000>;
-               vin-supply = <&vcc5v0_sys>;
-       };
 };
 
 &combphy0_ps {
@@ -335,12 +320,6 @@
                        rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
                };
        };
-
-       m2e {
-               vcc3v3_wf_en: vcc3v3-wf-en {
-                       rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
-               };
-       };
 };
 
 &pwm1 {
@@ -391,7 +370,7 @@
        sd-uhs-sdr25;
        sd-uhs-sdr50;
        sd-uhs-sdr104;
-       vmmc-supply = <&vcc3v3_wf>;
+       vmmc-supply = <&vcc3v3_pcie2x1l0>;
        vqmmc-supply = <&vcc_1v8_s3>;
        pinctrl-names = "default";
        pinctrl-0 = <&sdiom0_pins>;