From: Chen-Yu Tsai <wenst@chromium.org>
To: "Matthias Brugger" <matthias.bgg@gmail.com>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
"Ryder Lee" <ryder.lee@mediatek.com>,
"Jianjun Wang" <jianjun.wang@mediatek.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kwilczynski@kernel.org>,
"Manivannan Sadhasivam" <mani@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Chen-Yu Tsai <wenst@chromium.org>,
Bartosz Golaszewski <brgl@bgdev.pl>,
linux-pci@vger.kernel.org, linux-mediatek@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 7/7] arm64: dts: mediatek: mt8195-cherry-dojo: Describe M.2 M-key NVMe slot
Date: Wed, 25 Feb 2026 15:22:24 +0800 [thread overview]
Message-ID: <20260225072225.3345307-8-wenst@chromium.org> (raw)
In-Reply-To: <20260225072225.3345307-1-wenst@chromium.org>
The Dojo device has a M.2 M-key slot for an included NVMe on some
models.
Add a proper device tree description based on the new M.2 M-key binding.
Power for the slot is controlled by the embedded controller. As far as
the main SoC is concerned, it is always on.
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
---
.../dts/mediatek/mt8195-cherry-dojo-r1.dts | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-dojo-r1.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-dojo-r1.dts
index 49664de99b88..57cc329f49c4 100644
--- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-dojo-r1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-dojo-r1.dts
@@ -11,6 +11,28 @@ / {
compatible = "google,dojo-sku7", "google,dojo-sku5",
"google,dojo-sku3", "google,dojo-sku1",
"google,dojo", "mediatek,mt8195";
+
+ nvme-connector {
+ compatible = "pcie-m2-m-connector";
+ /* power is controlled by EC */
+ vpcie3v3-supply = <&pp3300_z2>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ nvme_ep: endpoint@0 {
+ reg = <0>;
+ remote-endpoint = <&pcie0_ep>;
+ };
+ };
+ };
+ };
};
&audio_codec {
@@ -72,6 +94,22 @@ &pcie0 {
pinctrl-names = "default";
pinctrl-0 = <&pcie0_pins_default>;
status = "okay";
+
+ pcie@0 {
+ compatible = "pciclass,0604";
+ reg = <0 0 0 0 0>;
+ device_type = "pci";
+ num-lanes = <2>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ ranges;
+
+ port {
+ pcie0_ep: endpoint {
+ remote-endpoint = <&nvme_ep>;
+ };
+ };
+ };
};
&pciephy {
--
2.53.0.414.gf7e9f6c205-goog
next prev parent reply other threads:[~2026-02-25 7:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-25 7:22 [PATCH 0/7] PCI: mediatek-gen3: add power control support Chen-Yu Tsai
2026-02-25 7:22 ` [PATCH 1/7] PCI: mediatek-gen3: Clean up mtk_pcie_parse_port() with dev_err_probe() Chen-Yu Tsai
2026-02-25 8:11 ` Bartosz Golaszewski
2026-02-25 13:13 ` AngeloGioacchino Del Regno
2026-02-25 7:22 ` [PATCH 2/7] PCI: mediatek-gen3: Add error path for probe and resume driver callbacks Chen-Yu Tsai
2026-02-25 8:19 ` Bartosz Golaszewski
2026-02-25 13:13 ` AngeloGioacchino Del Regno
2026-02-25 7:22 ` [PATCH 3/7] PCI: mediatek-gen3: Split out device power helpers Chen-Yu Tsai
2026-02-25 8:13 ` Bartosz Golaszewski
2026-02-25 13:13 ` AngeloGioacchino Del Regno
2026-02-25 7:22 ` [PATCH 4/7] PCI: mediatek-gen3: Disable device if further setup fails Chen-Yu Tsai
2026-02-25 8:19 ` Bartosz Golaszewski
2026-02-25 13:13 ` AngeloGioacchino Del Regno
2026-02-25 7:22 ` [PATCH 5/7] PCI: mediatek-gen3: Integrate new pwrctrl API Chen-Yu Tsai
2026-02-25 9:30 ` Bartosz Golaszewski
2026-02-25 9:37 ` Chen-Yu Tsai
2026-02-25 13:13 ` AngeloGioacchino Del Regno
2026-02-25 13:20 ` Manivannan Sadhasivam
2026-02-25 7:22 ` [PATCH 6/7] arm64: dts: mediatek: mt8195-cherry: add WiFi PCIe and BT USB power supplies Chen-Yu Tsai
2026-02-25 13:12 ` AngeloGioacchino Del Regno
2026-02-25 7:22 ` Chen-Yu Tsai [this message]
2026-02-25 13:12 ` [PATCH 7/7] arm64: dts: mediatek: mt8195-cherry-dojo: Describe M.2 M-key NVMe slot AngeloGioacchino Del Regno
2026-02-25 13:25 ` [PATCH 0/7] PCI: mediatek-gen3: add power control support Manivannan Sadhasivam
2026-02-26 6:12 ` Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260225072225.3345307-8-wenst@chromium.org \
--to=wenst@chromium.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=bhelgaas@google.com \
--cc=brgl@bgdev.pl \
--cc=devicetree@vger.kernel.org \
--cc=jianjun.wang@mediatek.com \
--cc=kwilczynski@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=robh@kernel.org \
--cc=ryder.lee@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®