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 35F62CD98C7 for ; Wed, 10 Jun 2026 08:42:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+N3jX2N/52iyiNHpRxwGQULSKcGPzXu4/gET/t4pE5E=; b=2UhNFkzNgDvyr6E/gMDZJaIHRT vuAW58I+9ZcugLaqKCWegK4bmHnnHEp9bZQFooF2MuRZUbnqW+4r/WEloToYyWR6sMcASm47YxeZz MRXKzy04zHy34xQKiTE8W4CvekptQVvZ8w6ROnINi5qpEiwk37hQBp2KQanNK8Y1UTXo/QuQ0Qnzb su6/SBG6qfZa1x1mS0lsuBVOx2xrjmnKhIIoRGV5sylCic4qpxciqdCucMvopuqG2vutYtnhqnZoY VjbgtN4KmfYTsS8vt+6aSTCFJSBIhO0X9aHQg7ZVBuhqdUl664pXOB+i8a7mSKjtKoFdeA7Zf3hhR Q6F5hjqA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wXEW0-000000076XA-22BM; Wed, 10 Jun 2026 08:42:24 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wXEVx-000000076Rz-2AFl for linux-arm-kernel@lists.infradead.org; Wed, 10 Jun 2026 08:42:23 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2bf18c30bb2so47296115ad.0 for ; Wed, 10 Jun 2026 01:42:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1781080941; x=1781685741; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+N3jX2N/52iyiNHpRxwGQULSKcGPzXu4/gET/t4pE5E=; b=Ic5rxYs5Z5ueHlbHGb8D4gnyO/27TrboqX8Vm/J7LvWn3Jl8SBxcDL/wVznvsGon7b jYt22YdpMLXH10sEQQcQmOfInRyL7eT0s4QUlLMZbGDk5pTIJKviHvZ/YsrWjnCUUEXm xUxVSbCvXCT/Uiugyc/BPYEQzGMSoFronYljQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781080941; x=1781685741; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+N3jX2N/52iyiNHpRxwGQULSKcGPzXu4/gET/t4pE5E=; b=Og+5KRmfMWl144bmIGifvEuIr7HkrS0SuWB6weSZH9K96Dgzqap3TW4G1m7X4Nt1mJ 8FYUisNoRdg+RWqIJ8nThZhYBOzptNzCiRZJIxnrKO5y6wa0BtvA/W9mpU0QNskXpbQJ 65jBh0ql8mip+OmuGzFQDyH5XZ+FEi62ODVdz00w07EwwN94NkcxayUQ8ZMoFsXxRZSH L1es3pIEgOdMU6j5BbYlHf541bmgfTkf0b9kR36quy6aui/bjtOmMf+lRhTuuOjDokhk HY+B6gf9Jni2N3OtLvzkujwtKmIJTVyq05+6wBgqQc54CBybBf+iRTLz8+K71zBidonP 4kpA== X-Forwarded-Encrypted: i=1; AFNElJ8WTiBYLo4EoatYmuGoR+dBGR/R8umMo+LEKgNucoBxJlobUwpkzz8J7Uh4f61P56AtUW6yLekzQvpqPL77GAOC@lists.infradead.org X-Gm-Message-State: AOJu0YzkStpFhno7g9UO6uIXXvjH/GC7K+U0Ei4wA4OzIInpN2BgpCwc ZnxszFqS8EUmaDd+t9swD9rVV88YhoAe+lW3x1ChsOAeCt2UPAUS6ahMyYc9pWHdDg== X-Gm-Gg: Acq92OG1D7VHkAZxbxvBPKj8h8PcWGIyaAxEkxRzDXPzRk7KYRyTPe+1CisdHe3PhD/ qRRzAIb2vfWm0Xwv069flG2guE7DJtZMGxeaeN28TluIKZ9Omx9QgHPisexTuY0oqYfBYAQJbaC MFz9O8rXA7mEvk3GwzS1J5XariVDdpHokosf5p7eDdi67RTRw5RcXo1Frl5/geG8bCsz/dAXuyq SEEmAqmkfRptFM9MVEolR3mUmd+QQEZ1zUOolTJ+wMnbT+O/C10L8E6Z3akhwS3vjukcEzhf2yc CLdwVbd/ZYGMkJz/OKpUDItG/dNh7yHPjYYuBJBycQVUY2grc2rEODMv8QNnyrfZcZOs3vqJJfb GFsBmk/Qyt+SJ1kBQFC9yxPfgFSac096VN/UTchomNDfKUMLdBulaCu3WTlDDP1ok9EkLx9UOtZ rEW+/3rCO+T/Brez5GZvZ3JUFEAAw7ja0zzWHNM46Ew0MV+CvHzNBjtbW7gLN1hf1piIxipaPQ9 Yg1Bk+oBAVcwDNCUw== X-Received: by 2002:a17:902:e5ca:b0:2c0:b932:867d with SMTP id d9443c01a7336-2c1e893d0b9mr271721185ad.29.1781080940790; Wed, 10 Jun 2026 01:42:20 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:3870:6325:16c:d35c]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c164f890b2sm239223725ad.26.2026.06.10.01.42.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 01:42:20 -0700 (PDT) From: Chen-Yu Tsai To: Bartosz Golaszewski , Greg Kroah-Hartman , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , "Rafael J. Wysocki" , Danilo Krummrich , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno Cc: Alan Stern , Chen-Yu Tsai , linux-acpi@vger.kernel.org, driver-core@lists.linux.dev, linux-pm@vger.kernel.org, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Manivannan Sadhasivam Subject: [PATCH v2 14/16] arm64: dts: mediatek: mt8195-cherry: Add M.2 E-key slot Date: Wed, 10 Jun 2026 16:40:48 +0800 Message-ID: <20260610084053.2059858-15-wenst@chromium.org> X-Mailer: git-send-email 2.54.0.1099.g489fc7bff1-goog In-Reply-To: <20260610084053.2059858-1-wenst@chromium.org> References: <20260610084053.2059858-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260610_014221_604870_5698F875 X-CRM114-Status: GOOD ( 15.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Mt8195 Cherry design features an M.2 E-key slot for WiFi/BT combo cards. Only PCIe and USB are wired from the SoC to the slot, along with some auxiliary signals. Add the proper representation for it, replacing the PCIe wifi node and vpcie3v3-supply property under the PCIe controller, and the vbus-supply property under the xhci3 node. Signed-off-by: Chen-Yu Tsai --- .../boot/dts/mediatek/mt8195-cherry.dtsi | 74 +++++++++++++++++-- 1 file changed, 69 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi index ef7afc436aef..c95a54de3567 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi @@ -266,6 +266,47 @@ tboard_thermistor2: thermal-sensor-t2 { 120000 51 125000 44>; }; + + wifi-bt-connector { + compatible = "pcie-m2-e-connector"; + pinctrl-names = "default"; + pinctrl-0 = <&m2_e_key_kill_pins>; + vpcie3v3-supply = <&pp3300_wlan>; + w-disable1-gpios = <&pio 61 GPIO_ACTIVE_LOW>; + w-disable2-gpios = <&pio 59 GPIO_ACTIVE_LOW>; + /* PCIe auxiliary signals wired to controller. */ + + ports { + #address-cells = <1>; + #size-cells = <0>; + + /* PCIe for WiFi */ + port@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + wifi_ep: endpoint@0 { + reg = <0>; + remote-endpoint = <&pcie1_ep>; + }; + }; + + /* USB for Bluetooth */ + port@2 { + reg = <2>; + #address-cells = <1>; + #size-cells = <0>; + + bt_ep: endpoint@0 { + reg = <0>; + remote-endpoint = <&usb3_ep>; + }; + }; + + /* SDIO, UART and I2S not implemented */ + }; + }; }; &adsp { @@ -791,14 +832,14 @@ pcie@0 { reg = <0 0 0 0 0>; device_type = "pci"; num-lanes = <1>; - vpcie3v3-supply = <&pp3300_wlan>; #address-cells = <3>; #size-cells = <2>; ranges; - wifi@0 { - reg = <0 0 0 0 0>; - wakeup-source; + port { + pcie1_ep: endpoint { + remote-endpoint = <&wifi_ep>; + }; }; }; }; @@ -1085,6 +1126,14 @@ pins-bus { }; }; + m2_e_key_kill_pins: m2-e-key-kill-pins { + pins-kill { + pinmux = , + ; + output-high; + }; + }; + mmc0_pins_default: mmc0-default-pins { pins-cmd-dat { pinmux = , @@ -1637,9 +1686,24 @@ &xhci2 { &xhci3 { /* MT7921's USB Bluetooth has issues with USB2 LPM */ usb2-lpm-disable; - vbus-supply = <&pp3300_wlan>; vusb33-supply = <&mt6359_vusb_ldo_reg>; status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + usb3_ep: endpoint@0 { + reg = <0>; + remote-endpoint = <&bt_ep>; + }; + }; + }; }; #include -- 2.54.0.1099.g489fc7bff1-goog