mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
66 lines
1.9 KiB
Diff
66 lines
1.9 KiB
Diff
|
From 0002c377e862140ad65b67b8b9dbf086d4578f95 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Tam=C3=A1s=20Sz=C5=B1cs?= <tszucs@protonmail.ch>
|
||
|
|
Date: Wed, 11 Oct 2023 18:18:05 +0000
|
||
|
|
Subject: [PATCH] arm64: dts: rockchip: Remove duplicate regulator vcc3v3_wf
|
||
|
|
from rock-5b
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
.../boot/dts/rockchip/rk3588-rock-5b.dts | 23 +------------------
|
||
|
|
1 file changed, 1 insertion(+), 22 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
|
||
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
|
||
|
|
@@ -113,21 +113,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 {
|
||
|
|
@@ -334,12 +319,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 {
|
||
|
|
@@ -390,7 +369,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>;
|