* [PATCH] arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf from rock-5b
@ 2023-10-11 18:18 Tamás Szűcs
2023-10-11 22:36 ` Heiko Stuebner
0 siblings, 1 reply; 2+ messages in thread
From: Tamás Szűcs @ 2023-10-11 18:18 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner,
Cristian Ciocaltea, Sebastian Reichel, Christopher Obbard,
Shreeya Patel, Tamás Szűcs, devicetree,
linux-arm-kernel, linux-rockchip, linux-kernel
Regulator for VCC3V3_WF has been added as vcc3v3_pcie2x1l0 first. Clean this up.
Signed-off-by: Tamás Szűcs <tszucs@protonmail.ch>
---
.../boot/dts/rockchip/rk3588-rock-5b.dts | 23 +------------------
1 file changed, 1 insertion(+), 22 deletions(-)
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>;
--
2.42.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf from rock-5b
2023-10-11 18:18 [PATCH] arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf from rock-5b Tamás Szűcs
@ 2023-10-11 22:36 ` Heiko Stuebner
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Stuebner @ 2023-10-11 22:36 UTC (permalink / raw)
To: devicetree, Tamás Szűcs, Conor Dooley,
Sebastian Reichel, Rob Herring, linux-arm-kernel,
Christopher Obbard, Shreeya Patel, Cristian Ciocaltea,
Krzysztof Kozlowski, linux-kernel, linux-rockchip
Cc: Heiko Stuebner
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,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-11 22:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-11 18:18 [PATCH] arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf from rock-5b Tamás Szűcs
2023-10-11 22:36 ` Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).