Commit 0002c377 authored by Tamás Szűcs's avatar Tamás Szűcs Committed by Heiko Stuebner
Browse files

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: 1c9a53ff ("arm64: dts: rockchip: Add sdio node to rock-5b")
Signed-off-by: default avatarTamás Szűcs <tszucs@protonmail.ch>
Link: https://lore.kernel.org/r/20231011181757.58047-1-tszucs@protonmail.ch


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 8152d3d0

arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts

+1 −22
Original line number Diff line number Diff line
@@ -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>;