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 E0890C79F85 for ; Fri, 4 Sep 2026 08:44:51 +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=u+z8Cwnd44tBSJzkmGNNNosSpCrM38d+qGnlF9iz0lg=; b=gZadMPiJtqE2euA6WBlU2bGC0n 5MK0/JBdiXfBThgfU4ry4OVlUrYizefyIYYW64inlgc5V/1zZaYIUXwQ5Yxs+rYr8TyzeCJ5nqeGB yaYgegYmmqEal1WFd/s78e2D757V/MFcRNFwspIWrwelWUMzXwYJJj5YIDgrZx6C6qHJrLT6QCq8S o32mJwV+Qgmm8f5iVXFbaYH6JKG0a2uLvH6l32Afd9cMrsmbLyH3ssakbhpP9+jYpib7T/gCCIlKF cjdUx+pNAmWnJ72CmQ8gJvi8xNekKKXH6vwncJB/8tUjaKpCg4WiBdbkEysOuCK6+Xx7n8kfJuLVm 4Gtdoi6Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x2PXP-00000001Qwi-3IIz; Fri, 04 Sep 2026 08:44:43 +0000 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x2PXL-00000001Qr0-1LCG for linux-arm-kernel@lists.infradead.org; Fri, 04 Sep 2026 08:44:40 +0000 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-398a5aad413so576619a91.3 for ; Fri, 04 Sep 2026 01:44:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1788511479; x=1789116279; 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:content-type; bh=u+z8Cwnd44tBSJzkmGNNNosSpCrM38d+qGnlF9iz0lg=; b=F3PKDaKoxQV0pRp6q8Bjbngc5w+dRUlT5tLivBiezCW4ItGrWB8IYJV+ugNX45XTnY C73jrXHMHfpH0fsvnPa7plAjlWWx6KS6Dxocd6apjqexwqrVcyUrJnZL0nDFIUJhD/gL A5WbkE7mAF+yoYsmLjYCC6Q7f/hyQqQ8jylhM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788511479; x=1789116279; 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:content-type; bh=u+z8Cwnd44tBSJzkmGNNNosSpCrM38d+qGnlF9iz0lg=; b=T3KzWAFFUpo+gFhySqVfSIOS4f3vN2eLq72JT3llPyi9gwfZ6dDRUJth9Nb4CnVCRR FWJj8xzJ/WbfbA/AS55F7nzIdEz69IYlcBOWo1L+rMy2m8dS990lhc7iklKxGidcz14u KOFPyH3JaVABeJt0IaRUtDmGXSy31eoIhgR9zj34YS+0BB3+9P6Y6DrDV4GVmSkB7275 LRtVHh0uvGXT6ECutrjia047qePLevTPgi+01TP7ZiRIpefJUlNdNncfk0VsHRf+uV5b wi08DsEDJZTRe3nUD/dxlBg/pxMtUZZoFXWfQXQTYDzImRFLSRrbXV0SoZ2ks/XKDulB LCMw== X-Forwarded-Encrypted: i=1; AKwUvBxRtdp+R8tfv/84Imy3KZeb6s0GLTyr1lsqtUeRTTq/c9tN8H0tiVpu0I0HowKSeK2jVZUXS73PAbLhlF0HPAyV@lists.infradead.org X-Gm-Message-State: AFuF++kdqeCJvaHozVE237Nnnn6M0UvB/NJtyD4nkobPGo5OAwWnurlJ usQLeCAhLmoKxmpk2m77FnTnMwL4IyHLD78Y+zsp6ewytcDTkgwTU/xbdi6qINNclg== X-Gm-Gg: AYBFou2MUfXTEsO1CCguoloVh2pFFdeXTyE3sPKDfN4d8dml/RcmMxwsab1gdiEY9vJ ulCTHjAl1LF2Sod8Ko3R2gRSwQYMB7sUmQ/Mjmo4/HdJXBG+SwKPL3GkY2mB7KI90IGxzaQDSZi ANcgEjbwrYykobGHTBF5BrGQLCNdpxm7TXZ+LwibzsQ87DGVsh51h2pAmH5Vc5Yi6t6xRH5S59m 0oBu1ogbNbGbNUnH5R5yOOIOxXtN7UKtk01NDCRq5lgslQpE61tHT4U5eMSqASDVq9VO3h8Z8il ZkUl0TlmdfeQGE84RO67GyWP6yUpsuyfx/uofgmbeJNmT/wXGZ01kLfO/YCb7AkGS1PH6KwadgI 5rvVdJfDpZUlI1Q94Bb0nLrSvq8XYBgtXkg/Z2XqzKOHdKj3C5h34JMBhwbweFxGnIi0PFMMOoe u5Iq7GWS9RufeavYzByN0dLJziMY3kOZUPfpaQRtQjneoSI/jLrHsxUTGHXf4oNFD1iaZCsIyPf /3nv+N2szr8PDWdMa2r87jDbiVuPLZDl3drST5uD0Vq X-Received: by 2002:a17:90b:1643:b0:380:21b7:e727 with SMTP id 98e67ed59e1d1-39b26272f04mr6897920a91.14.1788511478517; Fri, 04 Sep 2026 01:44:38 -0700 (PDT) Received: from wenst-7875.tpe.corp.google.com ([2a00:79e0:201d:8:343:bf21:3095:9c5]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39b260fdf9asm3343538a91.9.2026.09.04.01.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2026 01:44:38 -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: Wei Deng , Konrad Dybcio , 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 , Alan Stern , Bartosz Golaszewski Subject: [PATCH v8 15/16] arm64: dts: mediatek: mt8195-cherry: Add M.2 E-key slot Date: Fri, 4 Sep 2026 16:41:54 +0800 Message-ID: <20260904084158.1341550-16-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.979.g7e5102b832-goog In-Reply-To: <20260904084158.1341550-1-wenst@chromium.org> References: <20260904084158.1341550-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-20260904_014439_463490_B64D87AA X-CRM114-Status: GOOD ( 15.58 ) 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. Reviewed-by: Bartosz Golaszewski Signed-off-by: Chen-Yu Tsai --- Changes since v2: - Drop default GPIO output state from kill pins pinconfig --- .../boot/dts/mediatek/mt8195-cherry.dtsi | 73 +++++++++++++++++-- 1 file changed, 68 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..8d4cc30d91e4 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,13 @@ pins-bus { }; }; + m2_e_key_kill_pins: m2-e-key-kill-pins { + pins-kill { + pinmux = , + ; + }; + }; + mmc0_pins_default: mmc0-default-pins { pins-cmd-dat { pinmux = , @@ -1637,9 +1685,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.55.0.979.g7e5102b832-goog