From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D89EC44517 for ; Fri, 17 Jul 2026 07:23:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:MIME-Version:Message-Id :Date:Subject:From:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=2JLFFuygTOUtj5WMSol5Y04eGM+KHn54v5rTB7M/PiM=; b=dtQwXHi5IJycVh dAMVRjkWK7FDh703nur73vQaCRQJpAA8FZN7m97IizIupPom4PTnTq06nCMl/jk6ZQIHRQm4y0nlB ihhxe3AN/EsQSjlCQVt4vzcyf9lBgxN+6gnjcP8N3xsd/CNlMeEK4+JE5hMjZ016pC2jYBLZJ+myY jJjeDEpBvMvDuSLSj8nyY9PeNol3fniDro6PQakpLLgF/03pqwc8WuvKVx/CN1uvLmHpuPN4jEhhf WBjJ9UyyIN4+WDuvH9a5hvYdoI+61dp4mteWV91d7yhP4stuUry7SFdvUNOXEDB0tmgClh8lZPmQK Y1Fb7SEFm1xZyDPWeuhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wkcus-00000001P28-0Dg5; Fri, 17 Jul 2026 07:23:26 +0000 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wkcuj-00000001OhX-2IdQ; Fri, 17 Jul 2026 07:23:17 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 330AE60204; Fri, 17 Jul 2026 07:23:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id D2212C2BCB8; Fri, 17 Jul 2026 07:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1784272995; bh=3ik7W+9gyjFowQmjWQBDnQy5nB/T7fMjgiHMuGJ62Uc=; h=From:Subject:Date:To:Cc:Reply-To:From; b=V5mtkVHgw2yBjFSQbjTvvrN0rgDMHSGhxwcTUK5qeNoXPVKB0eXrpoekYFm42lors 5K9x7kU+KQor0HL7ZBqljENo8UgM/WreiC2Pj7RCVVNewcQ/b3/hQzxpBocsDUUy5r IlMYPkgR/2vaNrg2Ja75c8yYF5hNnvb5AL5FEnGee8mBCcUVGan6qm1tviN1Id0VYU eVQco+x0EParSeMWDDjEBJsK0Vg9vLDVbPERHgvH02BzIDsLhuJKRtqIqCbAqwltZW YdxuzTr8j+UAjCrDHGucwp4d4dvw5D2upLGov09h4EhLVLqC0YJ8/pzhIpXB8UnB27 n32KTzIWOatKQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADDACC44515; Fri, 17 Jul 2026 07:23:15 +0000 (UTC) From: Joachim Eastwood via B4 Relay Subject: [PATCH v4 00/12] arm64: dts: rockchip: Add NanoPi M6 board Date: Fri, 17 Jul 2026 09:22:58 +0200 Message-Id: <20260717-nanopi-m6-v4-0-b31391a72e41@gmail.com> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAAAAAAAC/12OTQ6CMBhEr0K6tqb96I+48h7GRS0t1EghFBsN4 e4WjEl1Ocm8NzOjYEZnAjoWMxpNdMH1PgW2K5BulW8MdnXKCAgIIgnFXvl+cLgT2FpjrAQOtpY o9YfRWPfcXOfLJ4fH9Wb0tArWRuvC1I+vbSzStff1lpk3UkzwoWRMUc4rTqtT0yl33+u+Q6s3Q kbS/FGERDIAIbkSnBH4J8uc/NksEwkguZDWal7rnFyW5Q3dRs15KAEAAA== X-Change-ID: 20260701-nanopi-m6-ffeef7252fd7 To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, diederik@cknow-tech.com, jonas@kwiboo.se, Joachim Eastwood , Krzysztof Kozlowski X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784272993; l=3739; i=joachim.eastwood@gmail.com; s=20260701; h=from:subject:message-id; bh=3ik7W+9gyjFowQmjWQBDnQy5nB/T7fMjgiHMuGJ62Uc=; b=arIj3aXgdhBAtfnisj7C5NsRHpUb9vJRIkGVz7e12XAA9mVuIztKdZ6CcO9OMm7ll/kTEhzce EVwZPVP1fpjBYITdCPkX4hU6SgtRTVzoQFJRdPWKxe6LGe2a664pslq X-Developer-Key: i=joachim.eastwood@gmail.com; a=ed25519; pk=ZN/8xWtdYaSd5oEfloYSZ1a+/ri0n0VZqjlEeHlbXFU= X-Endpoint-Received: by B4 Relay for joachim.eastwood@gmail.com/20260701 with auth_id=846 X-Original-From: Joachim Eastwood X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: joachim.eastwood@gmail.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org 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 --- 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/20260713-nanopi-m6-v3-0-227567ffc5dc@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 | 797 +++++++++++++++++++++ 6 files changed, 1010 insertions(+), 792 deletions(-) --- base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482 change-id: 20260701-nanopi-m6-ffeef7252fd7 Best regards, -- Joachim Eastwood _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip