* [PATCH v2 1/9] arm64: dts: rockchip: rk3588s-nanopi: fix sd min/max voltage
2026-11-01 21:55 [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Joachim Eastwood via B4 Relay
@ 2026-11-01 21:55 ` Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 2/9] arm64: dts: rockchip: rk3588s-nanopi: enable mmc-hs400 and add supplies Joachim Eastwood via B4 Relay
` (8 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-01 21:55 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Shawn Lin, Diederik de Haas, devicetree, linux-arm-kernel,
linux-rockchip, Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
This regulator is only a simple power switch and cannot change the
output voltage.
Fixes: c08257d642ac ("arm64: dts: rockchip: refactor rk3588s-nanopi-r6 to support M6 boards")
Reviewed-by: Shawn Lin <Shawn.lin@rock-chips.com>
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
index 22b0cdee22b40..8c36268e98768 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
@@ -79,8 +79,8 @@ vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 {
pinctrl-0 = <&sd_s0_pwr>;
regulator-name = "vcc_3v3_sd_s0";
regulator-boot-on;
- regulator-max-microvolt = <3000000>;
- regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-min-microvolt = <3300000>;
vin-supply = <&vcc_3v3_s3>;
};
--
2.56.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 2/9] arm64: dts: rockchip: rk3588s-nanopi: enable mmc-hs400 and add supplies
2026-11-01 21:55 [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 1/9] arm64: dts: rockchip: rk3588s-nanopi: fix sd min/max voltage Joachim Eastwood via B4 Relay
@ 2026-11-01 21:55 ` Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 3/9] arm64: dts: rockchip: rk3588s-nanopi: add voltage iio-hwmon device Joachim Eastwood via B4 Relay
` (7 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-01 21:55 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Shawn Lin, Diederik de Haas, devicetree, linux-arm-kernel,
linux-rockchip, Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
The NanoPi 6 series all support eMMC 5.1 HS400 mode. This also matches
the vendor device tree. Also add power supplies while at it.
Reviewed-by: Shawn Lin <Shawn.lin@rock-chips.com>
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
index 8c36268e98768..8c77ee71ebf85 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
@@ -390,7 +390,10 @@ &sdhci {
no-sdio;
no-sd;
non-removable;
- mmc-hs200-1_8v;
+ mmc-hs400-1_8v;
+ mmc-hs400-enhanced-strobe;
+ vmmc-supply = <&vcc_3v3_s3>;
+ vqmmc-supply = <&vcc_1v8_s3>;
status = "okay";
};
--
2.56.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 3/9] arm64: dts: rockchip: rk3588s-nanopi: add voltage iio-hwmon device
2026-11-01 21:55 [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 1/9] arm64: dts: rockchip: rk3588s-nanopi: fix sd min/max voltage Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 2/9] arm64: dts: rockchip: rk3588s-nanopi: enable mmc-hs400 and add supplies Joachim Eastwood via B4 Relay
@ 2026-11-01 21:55 ` Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 4/9] arm64: dts: rockchip: rk3588s-nanopi: move vcc_3v3_s0 to nanopi-r6 Joachim Eastwood via B4 Relay
` (6 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-01 21:55 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Shawn Lin, Diederik de Haas, devicetree, linux-arm-kernel,
linux-rockchip, Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
The NanoPi 6 series have a resistor divider on the main input supply to
support voltage measurements. Hook this up as a hwmon device so it is
possible to monitor the voltage.
Output from sensors on NanoPi-M6:
vdd_usbc_iio_hwmon-isa-0000
Adapter: ISA adapter
in1: 19.80 V
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
index 8c77ee71ebf85..a47677926a59b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
@@ -95,6 +95,19 @@ vcc5v0_host_20: regulator-vcc5v0-host-20 {
regulator-max-microvolt = <5000000>;
vin-supply = <&vcc5v0_sys>;
};
+
+ vdiv_vdd_usbc: voltage-divider-vdd-usbc {
+ compatible = "voltage-divider";
+ #io-channel-cells = <1>;
+ io-channels = <&saradc 2>;
+ output-ohms = <10000>;
+ full-ohms = <110000>;
+ };
+
+ vdd-usbc-iio-hwmon {
+ compatible = "iio-hwmon";
+ io-channels = <&vdiv_vdd_usbc 0>;
+ };
};
&combphy0_ps {
--
2.56.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 4/9] arm64: dts: rockchip: rk3588s-nanopi: move vcc_3v3_s0 to nanopi-r6
2026-11-01 21:55 [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Joachim Eastwood via B4 Relay
` (2 preceding siblings ...)
2026-11-01 21:55 ` [PATCH v2 3/9] arm64: dts: rockchip: rk3588s-nanopi: add voltage iio-hwmon device Joachim Eastwood via B4 Relay
@ 2026-11-01 21:55 ` Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 5/9] arm64: dts: rockchip: rk3588s-nanopi: rename sd power pin Joachim Eastwood via B4 Relay
` (5 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-01 21:55 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Shawn Lin, Diederik de Haas, devicetree, linux-arm-kernel,
linux-rockchip, Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
This regulator (power switch) is only present on R6 boards, and not M6
boards. It is regulator-always-on and regulator-boot-on because it's
controlled by the vcc_1v8_s0 power rail from the PMIC.
On R6 boards it's used by the Ethernet phy, and some VCCIO rails on the
SoC itself.
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi | 4 ++++
arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 14 ++++++++++++++
arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi | 11 -----------
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi
index 6644d3b72c9c7..6205a542cd1ab 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi
@@ -85,6 +85,10 @@ &i2s0_sdi0
status = "okay";
};
+&gmac1 {
+ phy-supply = <&vcc_3v3_s3>;
+};
+
&pcie2x1l1 { /* M.2 E-key 2230 */
vpcie3v3-supply = <&vdd_mpcie_3v3>;
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
index ac9eebd2b7906..b0892a3c633b1 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi
@@ -48,6 +48,16 @@ lan2_led: led-3 {
};
};
+ vcc_3v3_s0: regulator-vcc-3v3-s0 {
+ compatible = "regulator-fixed";
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc_3v3_s0";
+ vin-supply = <&vcc_3v3_s3>;
+ };
+
vcc5v0_usb_otg0: regulator-vcc5v0-usb-otg0 {
compatible = "regulator-fixed";
enable-active-high;
@@ -61,6 +71,10 @@ vcc5v0_usb_otg0: regulator-vcc5v0-usb-otg0 {
};
};
+&gmac1 {
+ phy-supply = <&vcc_3v3_s0>;
+};
+
&pinctrl {
gpio-key {
key1_pin: key1-pin {
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
index a47677926a59b..a99e2e60c5f72 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
@@ -61,16 +61,6 @@ vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
vin-supply = <&vcc5v0_sys>;
};
- vcc_3v3_s0: regulator-vcc-3v3-s0 {
- compatible = "regulator-fixed";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-name = "vcc_3v3_s0";
- vin-supply = <&vcc_3v3_s3>;
- };
-
vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 {
compatible = "regulator-fixed";
enable-active-high;
@@ -154,7 +144,6 @@ &gmac1 {
clock_in_out = "output";
phy-handle = <&rgmii_phy1>;
phy-mode = "rgmii-rxid"; /* Vendor provided tx delay value below */
- phy-supply = <&vcc_3v3_s3>;
pinctrl-0 = <&gmac1_miim
&gmac1_tx_bus2
&gmac1_rx_bus2
--
2.56.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 5/9] arm64: dts: rockchip: rk3588s-nanopi: rename sd power pin
2026-11-01 21:55 [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Joachim Eastwood via B4 Relay
` (3 preceding siblings ...)
2026-11-01 21:55 ` [PATCH v2 4/9] arm64: dts: rockchip: rk3588s-nanopi: move vcc_3v3_s0 to nanopi-r6 Joachim Eastwood via B4 Relay
@ 2026-11-01 21:55 ` Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 6/9] arm64: dts: rockchip: rk3588s-nanopi: rename usb host " Joachim Eastwood via B4 Relay
` (4 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-01 21:55 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Shawn Lin, Diederik de Haas, devicetree, linux-arm-kernel,
linux-rockchip, Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
sdmmc_pwren matches the signal name in the schematics, which simplifies
cross-referencing.
Reviewed-by: Shawn Lin <Shawn.lin@rock-chips.com>
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
index a99e2e60c5f72..1d37862edb5b5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
@@ -66,7 +66,7 @@ vcc_3v3_sd_s0: regulator-vcc-3v3-sd-s0 {
enable-active-high;
gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
- pinctrl-0 = <&sd_s0_pwr>;
+ pinctrl-0 = <&sdmmc_pwren>;
regulator-name = "vcc_3v3_sd_s0";
regulator-boot-on;
regulator-max-microvolt = <3300000>;
@@ -334,7 +334,7 @@ sdmmc_det_pin: sdmmc-det-pin {
rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
- sd_s0_pwr: sd-s0-pwr {
+ sdmmc_pwren: sdmmc-pwren {
rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
--
2.56.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 6/9] arm64: dts: rockchip: rk3588s-nanopi: rename usb host power pin
2026-11-01 21:55 [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Joachim Eastwood via B4 Relay
` (4 preceding siblings ...)
2026-11-01 21:55 ` [PATCH v2 5/9] arm64: dts: rockchip: rk3588s-nanopi: rename sd power pin Joachim Eastwood via B4 Relay
@ 2026-11-01 21:55 ` Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 7/9] arm64: dts: rockchip: rk3588s-nanopi: rename gmac1 reset pin Joachim Eastwood via B4 Relay
` (3 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-01 21:55 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Shawn Lin, Diederik de Haas, devicetree, linux-arm-kernel,
linux-rockchip, Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
usb_host_pwren matches the signal name in the schematics, which
simplifies cross-referencing. In M6/M6V2 this pin was renamed to
usb20_host_pwren.
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
index 1d37862edb5b5..56264ff3b409d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
@@ -79,7 +79,7 @@ vcc5v0_host_20: regulator-vcc5v0-host-20 {
enable-active-high;
gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
- pinctrl-0 = <&vcc5v0_host20_en>;
+ pinctrl-0 = <&usb_host_pwren>;
regulator-name = "vcc5v0_host_20";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@@ -340,7 +340,7 @@ sdmmc_pwren: sdmmc-pwren {
};
usb {
- vcc5v0_host20_en: vcc5v0-host20-en {
+ usb_host_pwren: usb-host-pwren { /* usb20_host_pwren on M6 */
rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
--
2.56.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 7/9] arm64: dts: rockchip: rk3588s-nanopi: rename gmac1 reset pin
2026-11-01 21:55 [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Joachim Eastwood via B4 Relay
` (5 preceding siblings ...)
2026-11-01 21:55 ` [PATCH v2 6/9] arm64: dts: rockchip: rk3588s-nanopi: rename usb host " Joachim Eastwood via B4 Relay
@ 2026-11-01 21:55 ` Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 8/9] arm64: dts: rockchip: rk3588s-nanopi-m6: rename pcie2 power pin Joachim Eastwood via B4 Relay
` (2 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-01 21:55 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Shawn Lin, Diederik de Haas, devicetree, linux-arm-kernel,
linux-rockchip, Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
gmac1_rstn matches the signal name in the schematics, which simplifies
cross-referencing.
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
index 56264ff3b409d..4edf3728e8d17 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi
@@ -274,7 +274,7 @@ rgmii_phy1: ethernet-phy@1 {
compatible = "ethernet-phy-id001c.c916";
reg = <0x1>;
pinctrl-names = "default";
- pinctrl-0 = <&rtl8211f_rst>;
+ pinctrl-0 = <&gmac1_rstn>;
reset-assert-us = <20000>;
reset-deassert-us = <100000>;
reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>;
@@ -307,6 +307,12 @@ &pd_npu {
};
&pinctrl {
+ gmac {
+ gmac1_rstn: gmac1-rstn {
+ rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
hdmi {
hdmi0_tx_on_h: hdmi0-tx-on-h {
rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -344,12 +350,6 @@ usb_host_pwren: usb-host-pwren { /* usb20_host_pwren on M6 */
rockchip,pins = <4 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
-
- rtl8211f {
- rtl8211f_rst: rtl8211f-rst {
- rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
- };
- };
};
&rknn_core_0 {
--
2.56.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 8/9] arm64: dts: rockchip: rk3588s-nanopi-m6: rename pcie2 power pin
2026-11-01 21:55 [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Joachim Eastwood via B4 Relay
` (6 preceding siblings ...)
2026-11-01 21:55 ` [PATCH v2 7/9] arm64: dts: rockchip: rk3588s-nanopi: rename gmac1 reset pin Joachim Eastwood via B4 Relay
@ 2026-11-01 21:55 ` Joachim Eastwood via B4 Relay
2026-11-01 21:55 ` [PATCH v2 9/9] arm64: dts: rockchip: rk3588s-nanopi-m6: rename pcie2 power rail Joachim Eastwood via B4 Relay
2026-11-01 22:19 ` [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Heiko Stübner
9 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-01 21:55 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Shawn Lin, Diederik de Haas, devicetree, linux-arm-kernel,
linux-rockchip, Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
pcie20x1_2_con_pwren matches the signal name in the schematics, which
simplifies cross-referencing.
Reviewed-by: Shawn Lin <Shawn.lin@rock-chips.com>
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi
index 6205a542cd1ab..ca115d8e108a7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi
@@ -41,7 +41,7 @@ vcc_3v3_pcie: regulator-vcc-3v3-pcie {
enable-active-high;
gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
- pinctrl-0 = <&pcie2_2_pwren>;
+ pinctrl-0 = <&pcie20x1_2_con_pwren>;
regulator-name = "vcc_3v3_pcie";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -116,7 +116,7 @@ hp_det: hp-det {
};
pcie {
- pcie2_2_pwren: pcie2-2-pwren {
+ pcie20x1_2_con_pwren: pcie20x1-2-con-pwren {
rockchip,pins = <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
--
2.56.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 9/9] arm64: dts: rockchip: rk3588s-nanopi-m6: rename pcie2 power rail
2026-11-01 21:55 [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Joachim Eastwood via B4 Relay
` (7 preceding siblings ...)
2026-11-01 21:55 ` [PATCH v2 8/9] arm64: dts: rockchip: rk3588s-nanopi-m6: rename pcie2 power pin Joachim Eastwood via B4 Relay
@ 2026-11-01 21:55 ` Joachim Eastwood via B4 Relay
2026-11-01 22:19 ` [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Heiko Stübner
9 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood via B4 Relay @ 2026-11-01 21:55 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Heiko Stuebner
Cc: Shawn Lin, Diederik de Haas, devicetree, linux-arm-kernel,
linux-rockchip, Joachim Eastwood
From: Joachim Eastwood <joachim.eastwood@gmail.com>
vcc3v3_pcie matches the signal name in the schematics, which simplifies
cross-referencing.
Reviewed-by: Shawn Lin <Shawn.lin@rock-chips.com>
Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
---
arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi
index ca115d8e108a7..dd61c61fe7d7c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi
@@ -36,13 +36,13 @@ user_led: led-1 {
};
};
- vcc_3v3_pcie: regulator-vcc-3v3-pcie {
+ vcc3v3_pcie: regulator-vcc3v3-pcie {
compatible = "regulator-fixed";
enable-active-high;
gpios = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pcie20x1_2_con_pwren>;
- regulator-name = "vcc_3v3_pcie";
+ regulator-name = "vcc3v3_pcie";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc5v0_sys>;
@@ -95,7 +95,7 @@ &pcie2x1l1 { /* M.2 E-key 2230 */
&pcie2x1l2 { /* M.2 M-key 2280 */
pinctrl-0 = <&pcie20x1_2_perstn_m0>, <&pcie20x1m0_clkreqn>, <&pcie20x1m0_waken>;
- vpcie3v3-supply = <&vcc_3v3_pcie>;
+ vpcie3v3-supply = <&vcc3v3_pcie>;
};
&pinctrl {
--
2.56.0
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements
2026-11-01 21:55 [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Joachim Eastwood via B4 Relay
` (8 preceding siblings ...)
2026-11-01 21:55 ` [PATCH v2 9/9] arm64: dts: rockchip: rk3588s-nanopi-m6: rename pcie2 power rail Joachim Eastwood via B4 Relay
@ 2026-11-01 22:19 ` Heiko Stübner
2026-11-02 22:02 ` Joachim Eastwood
9 siblings, 1 reply; 12+ messages in thread
From: Heiko Stübner @ 2026-11-01 22:19 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, joachim.eastwood
Cc: Shawn Lin, Diederik de Haas, devicetree, linux-arm-kernel,
linux-rockchip, Joachim Eastwood
Hi Joachim
Am Sonntag, 1. November 2026, 22:55:18 Mitteleuropäische Normalzeit schrieb Joachim Eastwood via B4 Relay:
> This patch series contains a few fixes and miscellaneous improvements
> for the NanoPi 6 series of boards.
>
> Patch 1 fixes the voltage range on the SDMMC regulator.
> Patch 2 enables HS400 mode on eMMC. Tested on my M6 board.
> Patch 3 adds an IIO HWMON device to monitor the input voltage.
> Patch 4 moves a regulator that only exist R6 boards to the correct dtsi.
> Patch 5-9 renames DT names to match the schematics signals/nets.
>
> If patch 5-9 is just considered churn I'll drop them. These are more
> nice to have and just makes it easier to cross-reference DT and
> schematics.
>
> Schematics for the boards can be found here:
> M6: https://wiki.friendlyelec.com/wiki/images/8/85/NanoPi_M6_2405_SCH.PDF
> R6C: https://wiki.friendlyelec.com/wiki/images/f/f7/NanoPi_R6C_2302_SCH.PDF
> R6S: https://wiki.friendlyelec.com/wiki/images/2/2f/NanoPi_R6S_2208_SCH.PDF
>
> Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
> ---
> Changes in v2:
> - Add schematic links to cover letter to ease review
> - Renamed rtl8211f node to gmac
> - Add R-b tags from Shawn Lin
> - Rebased on v7.4-rc1
> - Link to v1: https://patch.msgid.link/20261014-nanopi-m6-improvements-v1-0-e713f71eb4d3@gmail.com
looks like we worked at the same time :-) .
As you will have seen just now, I applied your v1, so please send any
needed changes as follow up patches.
Thanks
Heiko
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements
2026-11-01 22:19 ` [PATCH v2 0/9] arm64: dts: rockchip: NanoPi 6 series fixes and improvements Heiko Stübner
@ 2026-11-02 22:02 ` Joachim Eastwood
0 siblings, 0 replies; 12+ messages in thread
From: Joachim Eastwood @ 2026-11-02 22:02 UTC (permalink / raw)
To: Heiko Stübner
Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Lin,
Diederik de Haas, devicetree, linux-arm-kernel, linux-rockchip
Hi Heiko,
On Sun, 1 Nov 2026 at 23:19, Heiko Stübner <heiko@sntech.de> wrote:
>
> Hi Joachim
>
> Am Sonntag, 1. November 2026, 22:55:18 Mitteleuropäische Normalzeit schrieb Joachim Eastwood via B4 Relay:
> > This patch series contains a few fixes and miscellaneous improvements
> > for the NanoPi 6 series of boards.
> >
> > Patch 1 fixes the voltage range on the SDMMC regulator.
> > Patch 2 enables HS400 mode on eMMC. Tested on my M6 board.
> > Patch 3 adds an IIO HWMON device to monitor the input voltage.
> > Patch 4 moves a regulator that only exist R6 boards to the correct dtsi.
> > Patch 5-9 renames DT names to match the schematics signals/nets.
> >
> > If patch 5-9 is just considered churn I'll drop them. These are more
> > nice to have and just makes it easier to cross-reference DT and
> > schematics.
> >
> > Schematics for the boards can be found here:
> > M6: https://wiki.friendlyelec.com/wiki/images/8/85/NanoPi_M6_2405_SCH.PDF
> > R6C: https://wiki.friendlyelec.com/wiki/images/f/f7/NanoPi_R6C_2302_SCH.PDF
> > R6S: https://wiki.friendlyelec.com/wiki/images/2/2f/NanoPi_R6S_2208_SCH.PDF
> >
> > Signed-off-by: Joachim Eastwood <joachim.eastwood@gmail.com>
> > ---
> > Changes in v2:
> > - Add schematic links to cover letter to ease review
> > - Renamed rtl8211f node to gmac
> > - Add R-b tags from Shawn Lin
> > - Rebased on v7.4-rc1
> > - Link to v1: https://patch.msgid.link/20261014-nanopi-m6-improvements-v1-0-e713f71eb4d3@gmail.com
>
> looks like we worked at the same time :-) .
yeah, seems like that :)
> As you will have seen just now, I applied your v1, so please send any
> needed changes as follow up patches.
Sure, thanks for applying!
There wasn't a lot of changes in v2, so it will be just a small patch to
renamed the rtl8211f node to gmac in the common nanopi.dtsi file.
I will include the patch in the next version of the M6V2 board support
patch set [1]. Sashiko found some issues so a new version is coming.
[1]: https://lore.kernel.org/linux-rockchip/20261101-nanopi-m6v2-v1-0-e401ea64b394@gmail.com/
best regards,
Joachim Eastwood
^ permalink raw reply [flat|nested] 12+ messages in thread