From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AEE23E7167 for ; Fri, 24 Jul 2026 08:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784882726; cv=none; b=RpBPxDtcKd61aG66ya+lpXPLtIQmQSZ/XPk5s1emuSzMkaGRuM/8Adt4vCriC3+mPsAEFhe6rJIm5jprPS8puwlfqDTw55dJ47xU8f4TChoH7cuN+Dvq6lpwRrTbrq39jR3TeIrYv0BzgTQItZBmCTlEMnNb87yMd0BzmTuBPBo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784882726; c=relaxed/simple; bh=5nZ4oAMk+j/TL2cUgeaIHep9LZ80pEB5bycph4BWJnY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CLFHu7DPVF0JZOxM73qATvepmza3f5orFZIyMFfR0jJbgiSznug25RnZfERPaMeQ1FI3U1AnHpKHWB/h/03fZyC0Hi4oQ80bWZlguEzxsBnKBukuebpEixBtot/4ULQ05/2qT8Crf5+3rZJ56TXO7DXIIvgluGZt0K1fJ5JXmnE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=a4R/TUXI; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="a4R/TUXI" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-38dfe910e9dso133455a91.3 for ; Fri, 24 Jul 2026 01:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1784882723; x=1785487523; darn=vger.kernel.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=pSIe19R3Jx2/rJrVImdy8rgHYnwLDdUMVV9CAsQ6TV0=; b=a4R/TUXICZl5YZAdlX+M0WpFb5JBSRjpS9nz+nMNEWuPKpgpGiPW1WRDVHM2lsT3n/ GtL6OXk/EsMk4Q21vsQaiBs+HCoKC2m59vhaCX2wnbk1KpMePAwWiaSzJJWhhU3bTS5O XnlN1lvux6kWt+T8uaAQGnn1S/+W+x8n0M2uQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784882723; x=1785487523; 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=pSIe19R3Jx2/rJrVImdy8rgHYnwLDdUMVV9CAsQ6TV0=; b=GhNZVCNJtL8Cyl7JYiWwJC7ER1mRtL44pXtlL1oDDJkqIo/BuS4Zpr7Im0F+uBYZqm HqoKZEAr66FaTXqB4gfQXDXmgI0lC8WosrIEWCjG0ua6SSTDVoGZU46xVU4pg4a99AqC E0fz+gk88XZYiqwDKyA3c85rSZLuvvpON6aWBy1G3w17Wj6dj9UhUWz/PyoJngDePeuF J+MXK25+xCIOuFit1HIXgk7r4/OGxCVI7Ime4Ucs0EwFxuj+k4zKhOhVD09fOax6GHw0 xAuBuJJtYrT2XoinLbi6ryRKvbGs9W7ITswWDe/BsaDkqueo825k9hoIv4cIluygTQog Slcg== X-Forwarded-Encrypted: i=1; AHgh+Rp19QRxyds+mUuJBno851XvRUOdWPifl+h3pDcupUloOSBSG/urnOkL+h4fyuWtesKleFU39qt0qMw=@vger.kernel.org X-Gm-Message-State: AOJu0YxabdiBo58ZJA+uN5h+49rGz9s9czDDDO8vNVSXLFcXZNn9ABiy NLqx4uDls0IzfgZnw6ASycJ/vkE1+yuF7+B619TNPuM+IJjZXdXG40Armn4nRbQG5g== X-Gm-Gg: AR+sD11AxOKlA+vUCixtZ3zmEfDcCV7SG7Vz8ZtyXNdNyHIUCZfavROjK06H6o2iebW kQljhmF6SGWIRoiE2MfkxekuNQnP8PUiP7DUeAekWVXRcwBeodPkvGHEtUrjaSau5sVsqKccm7V /twFAzXzl9Pei/O0ygQ92kJBH+1poRFbiL5Cg86Vp2Ij4vIlaQbNltf4wF41F/oz1VQrmUGr84S 8tD90xG5KldPDhUXNNorTOZtYOpjg6Kev0nnKMV9VXnC+JgnwxUaKaFuP0qdoJJ1ROC1mKe2K+Q Wr1o99zJYjWTmN4/DKavmmXJI8qNvCUNiWPg8SvAeJbFDPCEBpjiZNJcfeVRewx4l48CFiNFgwL SGWy0DsuKS9FZ/uh+lanBBWVHbtdKJ4idqE5yOCGj2baMHrWui3ud3KFE/kL1Bt1OHn4K/puOug TtmHHCB52WFUJOVW3cTS3+4r2QT0JqL1zeLlk+pxXRuZXSqHsAJtr0V0AhswP7RX0dc1cScg== X-Received: by 2002:a17:90b:586c:b0:38e:7446:d2b8 with SMTP id 98e67ed59e1d1-38ec6890685mr7222992a91.41.1784882723047; Fri, 24 Jul 2026 01:45:23 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:f131:86cc:5858:7325]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f089ac6d8sm434546a91.2.2026.07.24.01.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 01:45:21 -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 , 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 v7 15/16] arm64: dts: mediatek: mt8195-cherry: Add M.2 E-key slot Date: Fri, 24 Jul 2026 16:43:24 +0800 Message-ID: <20260724084328.3943997-16-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog In-Reply-To: <20260724084328.3943997-1-wenst@chromium.org> References: <20260724084328.3943997-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.229.g6434b31f56-goog