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 3BCC74071DE for ; Thu, 9 Jul 2026 09:58:55 +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=1783591137; cv=none; b=YHvyk16qjlNoYOjQ2BeTBWLsAbWVc/9/e788sSDr8atNpFbxY1O1tMzn7KFIs+HOwBSXwyeemUgTtKRnPgVz5Jf0ftvfZ32eem+MA0IumIeVbBrbi3Uh+DdeXmGfMn5GfC1RzErCD4sPj9ea3KGXXmsVarFpvbEBViMwus06Clc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783591137; c=relaxed/simple; bh=YJyU75cpPuviW3DeoVCtVsycwY35EMz4CrOCdWp2v74=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uyHFsbWjfsSfO78nL1wR3oSl8ngrDQAPwryZNfKPmi8Nu6yPxE0otlcD7kX72B8CjATYITVYeB8SzpSZYLvPhQdCXyDNlb4nDZ3remTQBqhvsIsEzmJypsp+njNg0CQJZVucQCwSRcQBWUQP1cIaKX8wVHjdBu0ZN9w/SPRYdkw= 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=duGC+b1l; 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="duGC+b1l" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2caed617615so16282265ad.3 for ; Thu, 09 Jul 2026 02:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1783591134; x=1784195934; 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=fzcA9TG2yqej8iZO6JRem4wjlVQiv9Z5qdYjer6rUOE=; b=duGC+b1lCSUBsIj+Lrl58uUbKvyNqEmJEHzggWi7cnrIDYhx2gfTtMhAB04S323Bps 7k9gOcRuXFCosb0j/sRW/Avu873p0kQtbbPMPjYqHbguvhme0pwXhlOOxEA1ZMruEMmW z87/c7x9QbIEIC4ihvyYqLuBTYJVwZb6nHzkc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783591134; x=1784195934; 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=fzcA9TG2yqej8iZO6JRem4wjlVQiv9Z5qdYjer6rUOE=; b=GG67xE6T6E0KBnxlureAZm7zlyBZztNC61RI4N7/d/1r3JPbfeGcGevbtO/jJXhxV5 MpK/hWHCjN9XgQW4b4PYqY988AjtEUtsxVj9Jz2FWRhUdC/7dJ+y0oWrP3GYZi/dwGRC jNYocvzQZxNXcaZ1xwhueXOGIoQrXEtdLFxsEFIDF0MmNmwqBMkRbiz75xKw0LUP7nWj B7TCaAHynD8byUDXuASWRCYLtNqaoxNbIJSlIFsE8ggnnZORUp5zuUE5bxN8WQaFVglX LhpSB0x0nhsWMLNzzobG/MaumQIdqzsFUgdKaB33xU/dff7Y1zPTLefssp15d8i7//Mh S+BA== X-Forwarded-Encrypted: i=1; AHgh+RrCWIpGo1H9woSubeQxMlx3j/kC5xfN6YJWgtR2a22ltLbjq4PbWBx0dcgzn1IQVRVfSJ8VQppEk50VfeY=@vger.kernel.org X-Gm-Message-State: AOJu0YxDKH8cIAV7HV7YL4jEBab2YTsKUzBRo0hyyTiJP9pTVEC+f+WL howeqpnUexnMmZxFvo+uzFAYpW9S54+1Ic+/NB1bV3PJGsELdQ9JbNfIl9tLMnyMiw== X-Gm-Gg: AfdE7ckGcT53zGcQLQi0uDjLHVOke+0GxsKP/9zaKueCmG9j9AzIZOhCCbqg35YfgCE 80bfp5qR5KyZ1QIckVyT5PaHPlRE1xIoNCoF3YB/kT3QtDMVWBDmyOD+MuL5RQukGyy+zBj42D+ 3a5oM/Ihab19Ged29dNIhygN0YNwHU4OmRmoiu7nltUVovMIB1GxJjRACb0bpv9yBdMhThoLrso VxzOTsjMB3TK05W0eMzFp37DDQfwekzLF5spzitW360FEuHIKSKb0tgpJ+E1VjjCKZu9vw0MNuP QAty9eYDYkYY92h4hEQ8ppz3E7REjBT0+0ZWwXoNvAfVl8Eyii230v4Y8Y2YaGyUmZ6QCJZkUg1 lCJYDj1d5nWqnqlXull453VcRw8RdGT7ObE/blnUp4sp881i+IfguuiwOxj78DU3mLdLldZ7bzc uLPLOWokRw7CG6Hh8ifMiXpviYXMq5ogGVFMIt+mTKlEwnTEhz7FmRZ5wDLZQpU3p3/X7iwA== X-Received: by 2002:a17:903:184:b0:2c0:a555:80d6 with SMTP id d9443c01a7336-2ccea384cc7mr68024015ad.2.1783591134472; Thu, 09 Jul 2026 02:58:54 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 02:58:54 -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 14/14] arm64: dts: mediatek: mt8188-geralt: Add WiFi/BT as M.2 E-key slot Date: Thu, 9 Jul 2026 17:57:19 +0800 Message-ID: <20260709095726.704448-15-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: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The MT8188 Geralt design features a chip-on-board WiFi/BT solution. This is a M.2 E-key WiFi/BT board layout directly inserted into the mainboard design. The connections to the rest of the board are almost the same as if it were a separate M.2 card. The only addition is the PMU_EN pin on the chip; on M.2 cards this would be tied to the primary power source. Model the chip-on-board WiFi/BT solution as a M.2 E-key slot with PCIe, USB and auxiliary signals. The PMU_EN pin, which enables the internal power controls and regulators, is modeled as a regulator fed by the pp3300_wlan regulator. Since power sequencing is now correctly modeled using the M.2 E-key slot, drop the "regulator-always-on" property one pp3300_wlan regulator. Also drop the comment in xhci2 saying "MT7921's power is controlled by PCIe". Also drop the voltage range on the pp3300_wlan regulator. This "regulator" is just a load switch and does not provide any regulation. Signed-off-by: Chen-Yu Tsai --- Changes since v2: - Drop default GPIO output state from kill pins pinconfig --- .../boot/dts/mediatek/mt8188-geralt.dtsi | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi b/arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi index dee946309121..73b5c0fdeae6 100644 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi @@ -88,13 +88,11 @@ pp3300_z1: regulator-pp3300-z1 { pp3300_wlan: regulator-pp3300-wlan { compatible = "regulator-fixed"; regulator-name = "pp3300_wlan"; - regulator-always-on; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; enable-active-high; gpio = <&pio 12 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&wlan_en>; pinctrl-names = "default"; + /* load switch */ vin-supply = <&pp3300_z1>; }; @@ -161,6 +159,17 @@ ppvar_mipi_disp_avee: regulator-ppvar-mipi-disp-avee { vin-supply = <&pp5000_z1>; }; + /* PMU_EN pin controls internal regulators and power sequence */ + wlan_pmu: regulator-wlan-pmu { + compatible = "regulator-fixed"; + regulator-name = "wlan-pmu"; + enable-active-high; + gpio = <&pio 145 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&wlan_pmu_en>; + pinctrl-names = "default"; + vin-supply = <&pp3300_wlan>; + }; + reserved_memory: reserved-memory { #address-cells = <2>; #size-cells = <2>; @@ -195,6 +204,39 @@ adsp_dma_mem: memory@61000000 { no-map; }; }; + + wifi-bt-connector { + compatible = "pcie-m2-e-connector"; + pinctrl-names = "default"; + pinctrl-0 = <&m2_e_key_kill_pins>; + vpcie1v8-supply = <&mt6359_vcn18_ldo_reg>; + vpcie3v3-supply = <&wlan_pmu>; + w-disable1-gpios = <&pio 13 GPIO_ACTIVE_LOW>; + w-disable2-gpios = <&pio 14 GPIO_ACTIVE_LOW>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + /* PCIe for WiFi */ + port@0 { + reg = <0>; + + wifi_ep: endpoint { + remote-endpoint = <&pcie_ep>; + }; + }; + + /* USB for Bluetooth */ + port@2 { + reg = <2>; + + bt_ep: endpoint { + remote-endpoint = <&usb2_ep>; + }; + }; + }; + }; }; &adsp { @@ -659,6 +701,22 @@ &pcie { pinctrl-names = "default"; pinctrl-0 = <&pcie_pins>; status = "okay"; + + pcie@0 { + compatible = "pciclass,0604"; + reg = <0 0 0 0 0>; + device_type = "pci"; + num-lanes = <1>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + port { + pcie_ep: endpoint { + remote-endpoint = <&wifi_ep>; + }; + }; + }; }; &pciephy { @@ -1002,6 +1060,13 @@ pins-bus { }; }; + m2_e_key_kill_pins: m2-e-key-kill-pins { + pins-kill { + pinmux = , + ; + }; + }; + mipi_disp_avdd_en: mipi-disp-avdd-en-pins { pins-en-ppvar-mipi-disp { pinmux = ; @@ -1174,6 +1239,13 @@ pins-bus { }; }; + wlan_pmu_en: wlan-pmu-en-pins { + pins-wlan-pmu-en { + pinmux = ; + output-low; + }; + }; + wlan_en: wlan-en-pins { pins-en-pp3300-wlan { pinmux = ; @@ -1417,10 +1489,22 @@ vdosys1_ep_ext: endpoint@1 { }; &xhci2 { - /* no power supply since MT7921's power is controlled by PCIe */ /* MT7921's USB BT has issues with USB2 LPM */ usb2-lpm-disable; status = "okay"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + + usb2_ep: endpoint { + remote-endpoint = <&bt_ep>; + }; + }; + }; }; #include -- 2.55.0.795.g602f6c329a-goog