diff options
| author | Tamás Szűcs <tszucs@protonmail.ch> | 2023-10-11 18:18:05 +0000 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2023-10-12 00:34:21 +0200 |
| commit | 0002c377e862140ad65b67b8b9dbf086d4578f95 (patch) | |
| tree | b01e1c97807b15ac6ad34a8424c465616b31065c /arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | |
| parent | 8152d3d070a9ca4f48020d11925718f1707db4f1 (diff) | |
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>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts')
| -rw-r--r-- | arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 23 |
1 files changed, 1 insertions, 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 @@ 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>; |