Re: [PATCH v5 00/12] arm64: dts: rockchip: Add NanoPi M6 board

Hi Heiko,

I guess this missed the merge window for 7.3.
Do you want me to send a new version once 7.3-rc1 is out or will you
pick up this version?

There is one very simple conflict in
arch/arm64/boot/dts/rockchip/Makefile with the LubanCat4 support
commit.


best regards,
Joachim Eastwood

On Tue, 28 Jul 2026 at 14:02, Joachim Eastwood via B4 Relay
<[email protected]> wrote:
>
> 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.
>
> Note that Sashiko may complain that u2phy0_otg is a dangling phandle in
> patch 11. This will never happen in practice so it's safe to ignore.
>
> Signed-off-by: Joachim Eastwood <[email protected]>
> ---
> Changes in v5:
> - Switch from simple-audio-card to audio-graph-card as Sashiko
>   complains, rightfully, that the bindings are a mismash of both.
> - Add pull-up on sd cd pin. Noticed by Diederik.
> - Link to v4: https://patch.msgid.link/[email protected]
>
> Changes in v4:
> - Remove boot-on reintroduction on vdd_npu_s0 in nanopi.dtsi during
>   refactor screw-up. Thanks to Sashiko for catching that.
> - Fix minor typo in "add gmac1 add phy-supply" commit message
> - Use schematic net names on PCIe reset lines. As suggested by Diederik.
> - Link to v3: https://patch.msgid.link/[email protected]
>
> 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/[email protected]
>
> 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/[email protected]
>
> ---
> 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 phy-supply
>       arm64: dts: rockchip: rk3588s-nanopi-r6: remove bogus vcc5v0_usb regulator
>       arm64: dts: rockchip: rk3588s-nanopi-r6: add comment about 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      |  57 ++
>  .../arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 792 +-------------------
>  arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi   | 797 +++++++++++++++++++++
>  6 files changed, 1000 insertions(+), 792 deletions(-)
> ---
> base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
> change-id: 20260701-nanopi-m6-ffeef7252fd7
>
> Best regards,
> --
> Joachim Eastwood <[email protected]>
>
>

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip