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 3F0DCC531FC for ; Fri, 24 Jul 2026 08:45: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=pSIe19R3Jx2/rJrVImdy8rgHYnwLDdUMVV9CAsQ6TV0=; b=ejpMobwB4Xhq4wIb+T3jvCd8t8 okc6QQ5AmNxNmmb1j995Mlc58uBhOclSxrqXDP9uMS3I3QR4aOepODnTrY2iXEdNWGvdEUJjKNoYq qHMjLaBHKE/UPMwDAQJjS3HmE5n4yQevIhthrflWJQYsNWgTv2t8yVdGZdHcxkpn7Nhh/Jm1apJ/J qsQYJtGxQMYL6aFiqhZEkui8vCtBt9iABjSmiWUyO9t6sxELynDsvdRqDpxhtBMUjJDYWAe/C4ZJI PpEgYDXN4zApj3Jo5xeUt7b7XlkD00WwuOaZ0KzLNRsZy+//rVW8h7J3LdfmA/XpPRYj4XJmLFrIy /o9mP+Pw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wnBXS-0000000FrmN-1R1i; Fri, 24 Jul 2026 08:45:50 +0000 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wnBX1-0000000FrQP-31bJ for linux-mediatek@lists.infradead.org; Fri, 24 Jul 2026 08:45:25 +0000 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-38d489b6b71so152358a91.0 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.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=pSIe19R3Jx2/rJrVImdy8rgHYnwLDdUMVV9CAsQ6TV0=; b=UMV2pH5F5XyuPMJGXmfVU/oU3iuKXZDX8IaJpNZem34DScDubzAWLudjISSid7d63e 9wZ00y+IA0gQYGQOn5QI376s0UEjbrrJXMt2tcS7HiItH2aZteMEJOPAO8w+WXTjFOUx SwagWO87C/w1KgYPyzFN45OQb1xQyQwWmF2wM= 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=D0LfwRaTYzEUSCrNB6V7w0ntIzPSoEM4jD9qlKTMBIe/guPH2ZxztUBufe3rMZGSO7 lNQt4tJ11GiE0R+4U10z9HFczFtNTPt4zB0YD1mLQuyhmgVBOJuPaK0WCTUlhV913kdJ JDk2ry9gCE3MzLEjmIueW0jafCBZp9y6jtRWRa7LM8efpxSok2tLrPGNKUdq+TKTZ1Zx 0dnDLPOJUTsbFirN1ZzFvWRn3NyG/qKRFs5R13hsxOdlhIeBUsgPoiSbW2NDCgM5enBb 08A8lWLpb/YQke06vPvMDYFyJJHjzKps0Qc0fthASi3OuWy57bJ0fQWGx9jRor0kHYTQ SS0w== X-Forwarded-Encrypted: i=1; AHgh+RrIppDdp7GFQtsha1rVeUrofmZCOz3tBH5AgIb+aw0EStKX124IzrGRe2GkWxrTDr0qzNB/S4Ke6X6P/9RYQg==@lists.infradead.org X-Gm-Message-State: AOJu0YzF8nydutgwoFAeZoBVyM8dyiFHEvWYBhEXT43FIuLkZ7pJbnes dGf90zDSwIfxRKF+7e0jv1bcwMtfQkAUdRUyslQjKBPlwT1gnL3sfnbEGIaHJRt4pA== X-Gm-Gg: AR+sD124osL8p1TdfaPZ6byOie8IYlvx360tsEIm5v8kyXzTyaE4O2ba+4JlFRwi4Me F4HrpTcnx8xhLgFR9pXS0YfiVIxKqu7At71ZG+UEMltidDzFOIGs2lyTikCSioLOSPQPecfPVNf oLU26LOGuICDCKLhtczHVE7R7ZN2Ckx7YnvgWZcbeZkfp04Ry2CcsjEDwUBAq0/Qc4hmSJMtPLw ZBpR/E7W7rI9DJU289WyBhQ1rP23n4xmRv2GiMlqh4B0JNb4atUqaqUoanbCnljWxYpaW9gN4f4 xZF+F6ddAsLZErOKK3eyDM1s5IhQMU2PB/QIRejaNJeMgJK6vG2gNPZR4FKx74HjNejWxTgYV9A z6lxBHY5RENQ5+P2ri9EMZJg1y9Ui04UhH+ATy8gklPMj7lTmKKEZzoHAX1/FKaXZ9/0hXiep/Y L23C1Tb23k6JEuV+KkqQHG4WrjrIoHWY1jhxpTQl246rf7361MYPHFStJhCcuAI7MbcaRJeQ== 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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260724_014523_793232_AF84B67B X-CRM114-Status: GOOD ( 13.70 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=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.229.g6434b31f56-goog