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 AFD8943DA42 for ; Fri, 15 May 2026 09:02:42 +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=1778835764; cv=none; b=cMKXfHc3RntUi5ws0G6ozhVi7nLW6C5zSR5MN5yG65xxN+H5HT2GmBAGibJRmnHmjN08VjT2h71HV4lgUmiD7SGhfc8/hSoUHg7B0lTkCobMSZzTL0nbvlHU97upvOg2joiMgXYqLDs3mWSF3zyNQfNgUzQ5dr43yzf2mKB5iBo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778835764; c=relaxed/simple; bh=VrOSzPFrQvicaTFR+8obgla8JultGfpYF5nJAKr0KVE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QCkIatuMAYen5I7MoLlkCmcNyPZZ/ZYirRcQgQU1ikoKZhrkpAKLlg0MIaD5haUK5vAQ3bRsXKGuvX1sVP64nVpxVrI9NfMRq9cZIqxSP70Gwk1Ebnhhrf10rDHKgYdBkq6LTVy2FfS7ZzcuqxaGLmCvb6z2Te/4cCdiLEy5qT4= 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=IntThx1g; 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="IntThx1g" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-367c26471f5so4883917a91.1 for ; Fri, 15 May 2026 02:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1778835762; x=1779440562; 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; bh=EEzJ+Z0L9sJzo3bRALn/EbUhsV+JTXUM3B754yNkOg8=; b=IntThx1gua/EnZx2ZFe7/kpR6hVhyNyEUOs2k/6V+pNbH5wQM1Vi7TcOx94YenaeSY h8dc7BzpYkhflcnMD0+IHW8dQjWY6vUjw/H2tg1BYRD3D7yKdX2nRejXG944hUODIrJi fp4ZXvqqCF5owqLc0Z0asUAjqMgqW8yYIJJ6c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778835762; x=1779440562; 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; bh=EEzJ+Z0L9sJzo3bRALn/EbUhsV+JTXUM3B754yNkOg8=; b=WyLVOxrGKP5ePFpbQq6pxa9O5a8TW2/CshX33s8btgs2TN97JwlGN9+CpeMrJKk+Zf ifhrV393ZusdjBL5lj+/VIaqrLalcIcrMgPnMYBtX5QfPu9Li3h4QnxsWOQlMbNMNbbt 6d+02Jhb9l7ekXFNPMTtbfAR+/wRRKOKaTdg9uT2uXJ/t7xMThI6R3ng1uaKC62zGAxM jTw0Cnt0FmJLGzs0TaE1V+45RZ3mZ3yjoFR7Y287wg4Ew1VxhZOGgTTVBIpnftjxVz6G AsFuD4p+ejk5vzlQPYIWE/8uYo8bZogwLmtYMmdmv+EXgXLJbsnNyfN8OpGAK6vdEeAD CW4Q== X-Forwarded-Encrypted: i=1; AFNElJ9ny5TfMjIE75nvl/KJSguLPLysaNW5o7Jp1IMoMtHMPiYtUMidXyJ8uYti43UpKUcY1w9/OORaNkpj@vger.kernel.org X-Gm-Message-State: AOJu0YxijecN/g0bilnWNUhY6ixmoQzxZcXvb0R8P6+xHCNaxrmLHsgw yf7CoENt4qG+GLEuktCbUoQTQp+9DSyenXlu2UsKLeLcpTF9MePgs+MtYRN9H7C9ew== X-Gm-Gg: Acq92OFRua6Nz3t9hhXEiZ2VeFw1VYRFUMb3dpoOopMKNn9h7ybjE9rhazr8g18T7Cz oFvzNKKRppMhWbmLbC/D49E7LcaZTl54XsOnEmSZW1RTWMeSC1mYvR/gZeuCzsSpcuX9tKClvrE AfWITjMR1OBmQP8KpzUNkU6Ttimy2QzNg+87SK5LXnxX7zLmmQqpWUcDdLrHt4bMrTkCYoW9TJ9 GlgRmq3o8VPAuHLvrrxFniomm+QyVt4VpDr/few/dg8X3iB3e2tjBaRGuasAdn1a+F6kuoo5LDY /1yAQbNjzBarZxMXhvMtk2D5yudS5ftSNWLX250Z4rM772UDfahdCM1sQ+L32aJ819J+10+0RVp e8Fxj5/7/Pvlq1AAWsn87Kt7uHGBQJYn11rWv4KhrEtoD42umr7cZyyL5KZWr0LXevEUaxoiIB0 Kq77/3OQqt5+zveLwfXUQjDyL7h51hWHj2qSGqnTXgsBnjmNTZzsrZYKDWcCQNgKdDLhQF19JFg 14YhYZ1 X-Received: by 2002:a17:90b:544f:b0:35f:b46e:e329 with SMTP id 98e67ed59e1d1-3695189552fmr3108678a91.6.1778835761921; Fri, 15 May 2026 02:02:41 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:b3d8:e32e:c2fc:c31e]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36951584654sm2076537a91.7.2026.05.15.02.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2026 02:02:41 -0700 (PDT) From: Chen-Yu Tsai To: Bartosz Golaszewski , Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , 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 Subject: [PATCH RFC 10/12] arm64: dts: mediatek: mt8195-cherry: Add M.2 E-key slot Date: Fri, 15 May 2026 17:01:46 +0800 Message-ID: <20260515090149.3169406-11-wenst@chromium.org> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog In-Reply-To: <20260515090149.3169406-1-wenst@chromium.org> References: <20260515090149.3169406-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 --- .../boot/dts/mediatek/mt8195-cherry.dtsi | 74 +++++++++++++++++-- 1 file changed, 69 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..c95a54de3567 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,14 @@ pins-bus { }; }; + m2_e_key_kill_pins: m2-e-key-kill-pins { + pins-kill { + pinmux = , + ; + output-high; + }; + }; + mmc0_pins_default: mmc0-default-pins { pins-cmd-dat { pinmux = , @@ -1637,9 +1686,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.54.0.563.g4f69b47b94-goog