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 8AE181FDA61 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=1784882724; cv=none; b=Lfjjsfr4zvRd7KE68H7tOzBmQ9DYBqfdYaxhz/lurNAWdNo86LWIhy1QbLGGhEUbzgesxpFjXegQvTzVfQUuTbA+DwqVSqGne81bqJU9fb132ahXF6jM6NKRF5OEzkoxHRG3zlr6q8JGqjma+glZ7LZe/4s/sT3T4Nx/pu8hH9k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784882724; c=relaxed/simple; bh=5nZ4oAMk+j/TL2cUgeaIHep9LZ80pEB5bycph4BWJnY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XTvHCXGqCJYdgK4I4qLbqJhpLAoYFt/yWjZ5a/eyTUt48gpK7BNEBMP0ubEYfJEl9Yn+jNoJlTH/vMc2x3gpiQ9gRxAWaYPz6+c4WX3Rsgu98e3oos0PAbWZckvHhsC72575ZN0lG+uhcnoQ8frMaNrvdxdFx15/8sNDuhhLECs= 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=DdR5eSo9; 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="DdR5eSo9" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-38dcbade417so170315a91.1 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=lists.linux.dev; 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=DdR5eSo9BEJMO79suOe+9s6f3Bu8PsiJlykD+tG672tAfXXhTkV7WTIDp/YEldy/wi spu7FLd0MSXp4PQ0vzM8PDjSLLKDFC2KHeX0XhxMC44Es4gBcHb5vsfY/vfvp2Nvyqyw H2ugKhPLYafDO5mc540ZFgu8gY6r51Dag+/F8= 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=YKP/vE8JmsuDXRwH8wCNHY5vU7jQvXN+9oH7VwI4heYRmDMSzGQVb+uwXUY1n+iazB lDgR60YpcYgqIXOh0+V3/dvM/cMUdvLV+YMnNeuAZdTWNEUe6bOqwCIS58zshwLp6tDA ELcQR6dGAtDVnf/ykJ3HR4fHH3xrlGr+u5Ij3msRSbfJzRrP3hpE5iQMImvL2oCRm6os hvR3tJUEytVkgtLWHfGY1I6xSFhul1Ssu43drqKlJ7N7t3h96sd4USHpX6mX015wTaSx WpS1ibobysdGfeynwneaPKSAnHfdoFsrBs5Y14TupZn6pR3Y1GbNfwubs4N7T2is7IiK qzBg== X-Forwarded-Encrypted: i=1; AHgh+Ro0+G9QwuSHNWQm7RFXMrPRs9AeQse2ZmdqcFHIcqaey0C8eGxLlax+nhRu+3DGMxPT6W1jsA6PiL8qdA==@lists.linux.dev X-Gm-Message-State: AOJu0YwmET/sps0JbidU9tOqhNarV0+bPISCXNDGui1PjnQtp0uDX19m UJojHL8ToM4pRQez8XiZ5HHBTjBtI8L08RyHqht9XEvBzLEl/xIUmuhFzLMUx6Zs2Q== X-Gm-Gg: AR+sD13T0Q1kCELiZwi9jDKD5MvnYxiSOhX+7Komsx1aPqG9JZQwHzVQMcvFy3wC1nz 5N3hvl5pliVJzc+OzW1GO5q6UHaovL9O1UvsPE2q/Jyw+JaHxEzJXYwiOxeaI+1/vIgylepTHwq sFA4uZ+s0kMqaj0REF3xHVBRDazT9UVf5szr+/C2dVSMkpy/vmOAlP6Gs29kKRFJ/L6yGGJFIoM A+ONWwIcg/UD3kNJVJ3paUE39FppvDsVU+wmPWkJBb0c2H62Opw4AXgfmJs79qSurzLpTG+uG1x DeaYy4RPybHqAViepQOz2oWUjt8FL7lNcdPT0oDeDOIyozpDs5PL7DHMYR/BAPNILEkcHKrDJvg fxuWwUEb1Lr/az9iFIcDeYVs19eroHkRGwFXqyG0c4pkieIAV2Fez0AKixs8uAM2wm2/DE6Lm1J ISvEaGukHD2QHiUwp50vn/Iq8OarJaSo7Hrz/MAgefzkwVAUk8z52nAuc8Xd2PbSDTeiZTKw== 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: driver-core@lists.linux.dev 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