[PATCH v3 00/12] arm64: dts: rockchip: Add NanoPi M6 board
Joachim Eastwood via B4 Relay
devnull+joachim.eastwood.gmail.com at kernel.org
Mon Jul 13 13:30:04 PDT 2026
This patch series add support for the NanoPi M6. This board is very
similar to the NanoPi R6C and R6S boards which are already supported.
Main differences:
* M.2 M-key slot with PCIe (Also present on R6C)
* M.2 E-key slot with PCIe and USB (from hub)
* 1 additional USB 2.0 port from an on-board USB hub
* RT5616 audio CODEC
Patch 1 documents the NanoPi M6 board compatibility string
Patch 2 to 10 are fixes and additions to the nanopi-r6 base DT
Patch 11 extracts the common NanoPi 6 series bits from nanopi-r6 into
nanopi.dtsi
The final patch adds support for NanoPi M6. Support for M6 has been
split into two files; one dtsi and one dts file. This makes it easier
to add support to the new M6V2 board at a later stage.
All changes have been verified using the schematics for M6, R6C and R6S.
Only M6 have been boot and runtime tested. Testers for R6x are welcome.
Signed-off-by: Joachim Eastwood <joachim.eastwood at gmail.com>
---
Changes in v3:
- Reorder patches so the DT fixes/additions are applied to
nanopi-r6.dtsi as suggested by Jonas Karlman
- Add comment to gmac to rgmii-rxid phy-mode to explain usage
- Addition of pinctrl to sd and pcie are now marked as fixes
- Remove both always-on and boot-on from NPU regulator
- Link to v2: https://patch.msgid.link/20260711-nanopi-m6-v2-0-422675a65402@gmail.com
Changes in v2:
- Organize DT such that adding support to NanoPi M6V2 later is easier
- Use correct clk id for I2C mclk out as suggested by Diederik.
- Add a couple of acks from Krzysztof Kozlowski.
- Link to v1: https://patch.msgid.link/20260703-nanopi-m6-v1-0-8344a1559519@gmail.com
---
Joachim Eastwood (12):
dt-bindings: arm: rockchip: add FriendlyElec NanoPi M6
arm64: dts: rockchip: rk3588s-nanopi-r6: fix missing sdmmc cd pinctrl
arm64: dts: rockchip: rk3588s-nanopi-r6: fix missing pcie rst pinctrl
arm64: dts: rockchip: rk3588s-nanopi-r6: remove pull up on rtc int pin
arm64: dts: rockchip: rk3588s-nanopi-r6: pcie2x1l2: add clkreq
arm64: dts: rockchip: rk3588s-nanopi-r6: remove always-on and boot-on from vdd_npu_s0 reg
arm64: dts: rockchip: rk3588s-nanopi-r6: remove useless vcc_3v3_pcie20
arm64: dts: rockchip: rk3588s-nanopi-r6: add gmac1 add phy-supply
arm64: dts: rockchip: rk3588s-nanopi-r6: remove bogus vcc5v0_usb regulator
arm64: dts: rockchip: rk3588s-nanopi-r6: add comment to gmac phy-mode
arm64: dts: rockchip: rk3588s-nanopi-r6: refactor to support M6 boards
arm64: dts: rockchip: add support for NanoPi M6 board
.../devicetree/bindings/arm/rockchip.yaml | 3 +-
arch/arm64/boot/dts/rockchip/Makefile | 1 +
.../arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi | 142 ++++
.../boot/dts/rockchip/rk3588s-nanopi-m6v1.dts | 67 ++
.../arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 792 +-------------------
arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi | 798 +++++++++++++++++++++
6 files changed, 1011 insertions(+), 792 deletions(-)
---
base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
change-id: 20260701-nanopi-m6-ffeef7252fd7
Best regards,
--
Joachim Eastwood <joachim.eastwood at gmail.com>
More information about the Linux-rockchip
mailing list