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

Commit Message

Tamás Szűcs Oct. 11, 2023, 6:18 p.m. UTC

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

Signed-off-by: Tamás Szűcs <[e-mail]>
---
 .../boot/dts/rockchip/rk3588-rock-5b.dts      | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

Comments

Heiko Stuebner Oct. 11, 2023, 10:36 p.m. UTC | #1

On Wed, 11 Oct 2023 18:18:05 +0000, Tamás Szűcs wrote:
> Regulator for VCC3V3_WF has been added as vcc3v3_pcie2x1l0 first. Clean this up.
> 
> 

Applied, thanks!

[1/1] arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf from rock-5b
      commit: 0002c377e862140ad65b67b8b9dbf086d4578f95

Best regards,

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 8618887899d9..392ac783c3ad 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -114,21 +114,6 @@  vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator {
 		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 @@  vcc5v0_host_en: vcc5v0-host-en {
 			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 @@  &sdio {
 	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>;