summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Pardini <ricardo@pardini.net>2026-06-05 13:54:35 +0200
committerHeiko Stuebner <heiko@sntech.de>2026-07-24 21:30:27 +0200
commit70f46aa2007e2a6d27e68d37d498ff893e9bc255 (patch)
treea280a2102a20c3eb62ed0ad506af7cbfcc9b8a6a
parent66f407e2c3b9ee768ae164687c2c293deb27d382 (diff)
downloadlinux-next-70f46aa2007e2a6d27e68d37d498ff893e9bc255.tar.gz
linux-next-70f46aa2007e2a6d27e68d37d498ff893e9bc255.zip
arm64: dts: rockchip: fix regulator names on NanoPC-T6
Three fixed-regulator names on the NanoPC-T6 don't match the board schematic [1]. - vcc3v3_pcie2x1l0 -> vdd_mpcie_3v3 This GPIO-switched 3v3 regulator is labeled vcc3v3_pcie2x1l0, but it is wired to and consumed by &pcie2x1l1. Per the schematic, the GPIO PCIE_M2_1_PWREN controls the power net VDD_MPCIE_3.3V; rename to match. - vdd_2v0_pldo_s3 -> vcc_2v0_pldo_s3 Typo in the regulator-name property of RK806-1 DCDC reg7. The node label and the schematic power-net name both already use the vcc_ form; only the regulator-name string had vdd_. - vcc3v3_pcie30 -> vcc3v3_pcie_m2_0 The GPIO-switched 3v3 feeding the M.2 M-Key (NVMe) slot is named after the PCIe controller it sits behind rather than the schematic power net. The schematic names it VCC3V3_PCIE_M2_0 (produced by an MP2143-based buck off VCC_5V0, enabled by PCIE_M2_0_PWREN); rename to match. No functional change. [1] https://wiki.friendlyelec.com/wiki/images/9/97/NanoPC-T6_2301_SCH.PDF Signed-off-by: Ricardo Pardini <ricardo@pardini.net> Link: https://patch.msgid.link/20260605-rk3588-dts-rockchip-nanopct6-fix-schematic-names-v1-1-15dd3b23ab1a@pardini.net Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index 7495af5bd973..cfdb5c13f860 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -201,25 +201,25 @@
vin-supply = <&vcc5v0_sys>;
};
- vcc3v3_pcie2x1l0: regulator-vcc3v3-pcie2x1l0 {
+ vdd_mpcie_3v3: regulator-vdd-mpcie-3v3 {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pcie_m2_1_pwren>;
- regulator-name = "vcc3v3_pcie2x1l0";
+ regulator-name = "vdd_mpcie_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc5v0_sys>;
};
- vcc3v3_pcie30: regulator-vcc3v3-pcie30 {
+ vcc3v3_pcie_m2_0: regulator-vcc3v3-pcie-m2-0 {
compatible = "regulator-fixed";
enable-active-high;
gpios = <&gpio2 RK_PC5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pcie_m2_0_pwren>;
- regulator-name = "vcc3v3_pcie30";
+ regulator-name = "vcc3v3_pcie_m2_0";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc5v0_sys>;
@@ -648,7 +648,7 @@
&pcie2x1l1 {
reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc3v3_pcie2x1l0>;
+ vpcie3v3-supply = <&vdd_mpcie_3v3>;
pinctrl-names = "default";
pinctrl-0 = <&pcie2_1_rst>;
status = "okay";
@@ -668,7 +668,7 @@
&pcie3x4 {
reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
- vpcie3v3-supply = <&vcc3v3_pcie30>;
+ vpcie3v3-supply = <&vcc3v3_pcie_m2_0>;
status = "okay";
};
@@ -985,7 +985,7 @@
regulator-min-microvolt = <2000000>;
regulator-max-microvolt = <2000000>;
regulator-ramp-delay = <12500>;
- regulator-name = "vdd_2v0_pldo_s3";
+ regulator-name = "vcc_2v0_pldo_s3";
regulator-state-mem {
regulator-on-in-suspend;