From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 AD3D43DC4CF for ; Fri, 24 Jul 2026 08:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784882725; cv=none; b=kQTWbjeGuDyTwObpPER+sT45eIycvwgzQUc+p190zlWdOh225/0s318a+PBPZMibeYPOzXTRWtjJU+uZLUQqYQnlUwBTVNjZ5XMPAOnT4PP1/nckS8+8ZHRqtXZMYpthE2sLB3P6v3aSUKE8erLXX/sgcR7GS1R8I3WDgnYCnIA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784882725; c=relaxed/simple; bh=5nZ4oAMk+j/TL2cUgeaIHep9LZ80pEB5bycph4BWJnY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cVLm37TyFoidIxy4pgkLfvvCvcTciacsEbbg7kuhLlQZThqdXo4SXvVqzRvxgwfoA1yPmVj3r86GHbtrW5XO2WuHOtkcrN+CTlJxVZglKUh3Dd8EesDrMmjpDeoktN6JGN4+euX7vLK1erELutv3APKBd5QjKqvWX4v3w/ivBnM= 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.47 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-f47.google.com with SMTP id 98e67ed59e1d1-38dfe910e9dso133454a91.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=sCKDzigq7plTY8RAeYX9DMyn0z87+a2/4+uPPFfOiYloFQp5D8eyUnVOxrJl1o3qZD g7DSklZUYFKG365LV5vxA8EB5NW+hEpG6wcQZPSo2gY/C9GfS4mHxj0u7moG5WSkhti1 OxTGw/MUPNOQJpshjDd7TVTjsZLNh4GijEAYu63MJssG1J3p2r6DiCYCxpthKy3hMgxJ rpl/DrGptLizmAxL6p7UOC9f32At3uGc+qMp8H77yscGS3/z0XEN3mlzxh7ajNbUfmK4 cgVxP2qz0ehjD55O1KbzN6GOmduK4r/vbl3CoMPM677Ru4JptwMWy0I3zealzDMeF6IQ NKsg== X-Forwarded-Encrypted: i=1; AHgh+RqIKAtLFr5eNaGuYA60vTMlACPeOde3qh9ZM/UcOwY6621joX2AefhB5tWAWMnISvvlzLnE0PSBEzhDy9E=@vger.kernel.org X-Gm-Message-State: AOJu0YwJr6yczjIZfMdwi4mEhPEQJYZXPWEKE7GMWxJqD1DpvMWnqyXf Vp9/VsvTAf3FP2pnEwt4DjFykpCHMMlUkGb4X7L53dsOxOemBeem5etTV759a8r25g== X-Gm-Gg: AR+sD12V/88hJbyVggb1sLJHycFwfGYQuJzlQVsPhoeqwxG3rvm5EoQk4ta6jnTdseD 7g+fw9GFbIefP5uPxr+4TM+jc6v0rNSRIwS461aTUtUt5uRMqsjh7qOZcziJAQJGCXmqTCg9X4U KmNVWcJKqvnvgAhKccOQmT9WUEiqJM7/LcAmfH2WQ7pmHo6wXVUQqh+oLtcOp9iAs6oM49bWRzP mP7nkg0FF6AhElsA+VfMv2OKKCD4XVgifzYzpN6llYiOxzAfoQDYMble5V4VJMY4ff8lQKP27Wg N25bGEcis6BSA081UTK/b+rMoXtFCfg1PEfL2Kp9NTz21dAlKn9amBPmqb1wzAXqweNyiqly1WI 9EH3OV3xr/3UdRqlDYIoKm84bf0lR8AKdcuDuNWetVYZPa0k5zKEeFrPiOascPfGL96f+ERDqpZ /jD25KvnfqsAAlhb14Ch2LxL1P6f6v6uy+o0TMi8M+7M7k4AokJ1j1n5xfK8aVR8N8tK7RHg== 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-kernel@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