From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 9641E40DFAF for ; Thu, 9 Jul 2026 09:58:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783591130; cv=none; b=kda4KfvYmZ2MKS1U2lpsiOe3oGenponMeXArpBjDVngB6Abv0itzBsHAakwDqAvMO7y+nj3v6HH2PBsMfiWDqsTktSqSd2V4getWYXyXsfCqwQOeVIF3wC0npQQoScTqByyJBM5zXoJqXm+edhhH/JT65zGgCgJakwKS07ZeyRg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783591130; c=relaxed/simple; bh=Kwdh1wsDA3PQhAJXo0c3P6asDMiUgGjPhgZiuNl33tU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FfSvfZDouuqwclLTN3SIUfLKMl3VPBJvTjSr+GjUa8nduYf6eE6t0pWtAWcrWIkOY/m303F/Vl6qooeT1A+7mFIbg0LiV6imZ1vOSCnFuSR5+ntz0Xw49pceWTyIKhgRzxOOEwKEmeRte5OwElknfTqtqNm4kkEdJX0GNdYYHsY= 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=WTgjieAf; arc=none smtp.client-ip=209.85.214.174 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="WTgjieAf" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2caea3f742bso8771735ad.0 for ; Thu, 09 Jul 2026 02:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1783591128; x=1784195928; 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=E3HJTWjS7+7k2AMeQ/ADfiVkN81b/TWdXvCN6CQ3PZA=; b=WTgjieAfs+UJDdeyn04913Pv6VWXPWClSQy45+aEABhhZsnmdf0obtmcHrxdA3cP1a JWQJHu5lNqr+EJKzJR1djDi/OOc7kCHshleopyPVAo7aXrlL0kViJlZkggwlprWrHyxz mAnu0Uh5fXa4bFfGtOIyX4CeNfu5lhvmeEi7I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783591128; x=1784195928; 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=E3HJTWjS7+7k2AMeQ/ADfiVkN81b/TWdXvCN6CQ3PZA=; b=OKTzpcE6kMx9/83v7VkmXChXLZ9OEUoR4UiEg/3xBzpe0MbKVVh1lQWNRbkCIrfL0u Mm5exDLHkO3CU5kraPSZzKhxtmmejQDsebfmz/yge5fhpJ/KT429jyzCUO7ErCF+k9VU AGmjgRmp4HaPhzeFuGWYfSWVm0/rCX+mpwYv6Ro08Qk4+mK+/UxlsRfw2Z9NsRGKx73r A3fbpPPJmmwcjI8vPTKyNroTNwjHTNZNiAIez+8c04vdG7Yw/sRW5GzCoQuZ1aM0Jrv1 bzLBdUcVYLuHeZhwuZsqPU7Dj5gZQoueYXTP2RSm/f+zsLINHdouDI/ecZ5eUAUIt+73 oY9Q== X-Forwarded-Encrypted: i=1; AHgh+RoUWIaC4fn7+jj69cygmVEv56W4rjQ3nOpX8LU0ZyO/gmGvrzmdWPxDK7ph8/K4DjxVAXAkvIYVwDvL@vger.kernel.org X-Gm-Message-State: AOJu0YwzI0m+v5dHnSkaW+ov5M4MC/pxALGG5wcWDRwwWWcLEPpefV75 rNsEeO80QTZ9Q+QNJH+ohZOm+SAcsjec785Kxpb4uj/jHpqf/bSFBx0E/V0/GXYrYw== X-Gm-Gg: AfdE7cnDHZKMhlWqKZcUA7y4UUXUmhJUaTv+fyoTqSEK8hNFH1xTwudLWBjUgTT4WDK X5OOK7RHJ+4o7hSSUFtIwZH+MBZCDy8BzDrilC8X7IPceMVMSk9seXLyKTrSOvg2sNMDDv+FD3P eQMphRUdgJEcJ9RVBHuzisPhAp+i4Zpgts59WmqStAV1LGd8qmDvyBxlI7OFxEfEtA/ufnGe3db jmnTD5oAUY9ua5IlhPAtpWtFOSbkdy+aeHwWtvgs/lMYszjSdXIFTl+mThgBoP3rluLjTeE+h1i rMqucxXrbr/ML6oX5ANGlAU74QYGMSd/9UwERaYQkdHahXaXpaFPtYWwVXzjJGU8kmTwL9Rziry dFK31/4B6EzOBHpYCRSfhgeJ3mIpz8y6rEwa4CVrfYREiM1PskdHZIaE7ucaEJsEzBZR8mbLv6n LyhCGXhblMW+PU7yLWryuqiDesMpY1e0oXysIWNZGjXZFM5V02D6G5TzyW4P66Kdh0YXvCXg== X-Received: by 2002:a17:903:17c6:b0:2cc:7e4a:bcc5 with SMTP id d9443c01a7336-2ccea480bdfmr74905205ad.32.1783591128101; Thu, 09 Jul 2026 02:58:48 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:bd09:6ddb:180a:69c5]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d5bd2fsm41082155ad.78.2026.07.09.02.58.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 02:58:47 -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: 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 Subject: [PATCH v4 13/14] arm64: dts: mediatek: mt8195-cherry: Add M.2 E-key slot Date: Thu, 9 Jul 2026 17:57:18 +0800 Message-ID: <20260709095726.704448-14-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.795.g602f6c329a-goog In-Reply-To: <20260709095726.704448-1-wenst@chromium.org> References: <20260709095726.704448-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: devicetree@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. 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.795.g602f6c329a-goog