From nobody Fri Dec 19 12:06:24 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 CA6E51B9834 for ; Tue, 3 Sep 2024 09:36:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725356203; cv=none; b=g992MvvIpj4fKwPgQZvkGOpcjEDRkmkn+zGITR983I1Y8KTKENzpeHQIag4Bz8uIrXWq4H8nh9TexfPORHsfbvHNYnCKlYOuub2d5AjL1Zg1YdYpCZovCFCq4jGzFwdl2i1wLcOwCeJMXxVeocofunXznYvTVmtm3X969OL8TvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725356203; c=relaxed/simple; bh=z1iqNeAiGpUeHwKHbsDWQIu946SEuEYhjJT9klq2P8g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K+6RDyhmZyziZqwUQBBQRrR9hK5+pCd8gyyc+nsLl8k4den8a72rPl38LI5hGVqYtDOjnFs9ZybYzSHpB6VseOJU1hayFlhNELtga0avL9YHoFETL1wwRme2BuArCsxBqbvsIrUqpSSdQx+OsAU3dAkW8l7X60ja3miDrTqJAhk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=N0yixplp; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="N0yixplp" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-42bb8cf8abeso40315555e9.2 for ; Tue, 03 Sep 2024 02:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1725356200; x=1725961000; 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=HIani+GzGnctSoq5cM9yHplasfYRkpXJ8EQCOX25EFg=; b=N0yixplpHqmKdZw+ppGeMhl1COVzAL0eQ3IYiTh5gS9DNvUEYBKaTtcSkFpY8XyrhK s4AzF83a5kLSSUsnc8rEcU8koUx7zQskDZEAPMgcBRiyuJ+o5aa44Mc6kKFJpqS+TwM7 OxKVXAV3m1sPXjGeBMuG92nHFZ7oRucsZN8ave8PR0i3GWrgL6/CF3dXQwxXfHQk0wHl OaJqGjS6WIp/P3YjoK+UPXn0G/H71ZIpRA3DKROJ02U6iYC44qjieNygwyGpHRshPlWQ W5hLzR4DRrpEWJgBKYUdhz7iVg7GOFML9IeqzTw1hfbTHltXVSdW/1hHHAkYD0hLlbZI F7pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725356200; x=1725961000; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HIani+GzGnctSoq5cM9yHplasfYRkpXJ8EQCOX25EFg=; b=cSu6BqMs4Z5YNT30bnT1OlJuxOhH9iG9+KnZ27W7KGP+1rahoc9chyzw40Az/RAjF6 5oLRMctxRLgy9G16bpTCRLV8D+uC3BmjyT0g20HdrnroAa9ODF4O2Kcy+PIRSJ9dE35X okeTYE1ExPhfP4clWZ1ElNtsg0SOqUDOd01cus3lSQb3uORH8MK5jTQul8rWgE3PQcYM WsvsSCLjfWY6lCV3Z8rLPHikGQa77td7F14nRlfxOuOVh/13cfD/eJ5+eXOPXzyDRSqf BC9kBECOc5VdKchOS6j20RUDP1DdufFqY+XgkasFv2t+xDlL9iVsAlzydQenhY5OpL6w Fv7g== X-Forwarded-Encrypted: i=1; AJvYcCXdtbIZx77QwdP22NdGlBXIgB3iDuup09ic718ESzE1eQMSiliWkB6Z4w/RwbTGBonfnITedWVBsLeACM4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8yg6i1KZUNVKayKRnrWxzFxDztmrNVUoRXB5Sj4dwp/AoR0CA QEwpvK3+JCv/yu61teCWsrTe0MLsUcp7Q6WzUsbzlxwjHQJp3urByqTpBlpOPgo= X-Google-Smtp-Source: AGHT+IFpTAnlLWSyFFJ2OhIzJWDhPga3IVZnbI7MzsLTbso5YG0mQbMIn954aeK/dk8PINOddSfouw== X-Received: by 2002:a05:600c:358b:b0:426:5416:67de with SMTP id 5b1f17b1804b1-42c8de9de13mr1113215e9.30.1725356199886; Tue, 03 Sep 2024 02:36:39 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:e61d:37d0:a59f:d06f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-376914bfca1sm790793f8f.18.2024.09.03.02.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 02:36:39 -0700 (PDT) From: Bartosz Golaszewski To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 1/3] arm64: dts: qcom: sc8280xp-crd: model the PMU of the on-board wcn6855 Date: Tue, 3 Sep 2024 11:36:26 +0200 Message-ID: <20240903093629.16242-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240903093629.16242-1-brgl@bgdev.pl> References: <20240903093629.16242-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Konrad Dybcio Add nodes for the WCN6855 PMU, the WLAN module and relevant regulators and pin functions to fully describe how the wifi is actually wired on this platform. Signed-off-by: Konrad Dybcio [Bartosz: - write the commit message, - rebase Konrad's commit, - fix one of the supplies' name] Co-developed-by: Bartosz Golaszewski Signed-off-by: Bartosz Golaszewski Reviewed-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 109 ++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dt= s/qcom/sc8280xp-crd.dts index 6020582b0a59..ec6bed8395b1 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -177,6 +177,17 @@ vreg_misc_3p3: regulator-misc-3p3 { regulator-always-on; }; =20 + vreg_s10b: regulator-s10b { + compatible =3D "regulator-fixed"; + + regulator-name =3D "VREG_S10B"; + regulator-min-microvolt =3D <1800000>; + regulator-max-microvolt =3D <1800000>; + + regulator-always-on; + regulator-boot-on; + }; + vreg_wlan: regulator-wlan { compatible =3D "regulator-fixed"; =20 @@ -260,6 +271,67 @@ usb1_sbu_mux: endpoint { }; }; }; + + wcn6855-pmu { + compatible =3D "qcom,wcn6855-pmu"; + + pinctrl-0 =3D <&wlan_en>; + pinctrl-names =3D "default"; + + wlan-enable-gpios =3D <&tlmm 134 GPIO_ACTIVE_HIGH>; + bt-enable-gpios =3D <&tlmm 133 GPIO_ACTIVE_HIGH>; + + vddio-supply =3D <&vreg_s10b>; + vddaon-supply =3D <&vreg_s12b>; + vddpmu-supply =3D <&vreg_s12b>; + vddrfa0p95-supply =3D <&vreg_s12b>; + vddrfa1p3-supply =3D <&vreg_s11b>; + vddrfa1p9-supply =3D <&vreg_s1c>; + vddpcie1p3-supply =3D <&vreg_s11b>; + vddpcie1p9-supply =3D <&vreg_s1c>; + + regulators { + vreg_pmu_rfa_cmn_0p8: ldo0 { + regulator-name =3D "vreg_pmu_rfa_cmn_0p8"; + }; + + vreg_pmu_aon_0p8: ldo1 { + regulator-name =3D "vreg_pmu_aon_0p8"; + }; + + vreg_pmu_wlcx_0p8: ldo2 { + regulator-name =3D "vreg_pmu_wlcx_0p8"; + }; + + vreg_pmu_wlmx_0p8: ldo3 { + regulator-name =3D "vreg_pmu_wlmx_0p8"; + }; + + vreg_pmu_btcmx_0p8: ldo4 { + regulator-name =3D "vreg_pmu_btcmx_0p8"; + }; + + vreg_pmu_pcie_1p8: ldo5 { + regulator-name =3D "vreg_pmu_pcie_1p8"; + }; + + vreg_pmu_pcie_0p9: ldo6 { + regulator-name =3D "vreg_pmu_pcie_0p9"; + }; + + vreg_pmu_rfa_0p8: ldo7 { + regulator-name =3D "vreg_pmu_rfa_0p8"; + }; + + vreg_pmu_rfa_1p2: ldo8 { + regulator-name =3D "vreg_pmu_rfa_1p2"; + }; + + vreg_pmu_rfa_1p7: ldo9 { + regulator-name =3D "vreg_pmu_rfa_1p7"; + }; + }; + }; }; =20 &apps_rsc { @@ -276,6 +348,13 @@ vreg_s11b: smps11 { regulator-initial-mode =3D ; }; =20 + vreg_s12b: smps12 { + regulator-name =3D "vreg_s12b"; + regulator-min-microvolt =3D <984000>; + regulator-max-microvolt =3D <984000>; + regulator-initial-mode =3D ; + }; + vreg_l3b: ldo3 { regulator-name =3D "vreg_l3b"; regulator-min-microvolt =3D <1200000>; @@ -304,6 +383,13 @@ regulators-1 { compatible =3D "qcom,pm8350c-rpmh-regulators"; qcom,pmic-id =3D "c"; =20 + vreg_s1c: smps1 { + regulator-name =3D "vreg_s1c"; + regulator-min-microvolt =3D <1888000>; + regulator-max-microvolt =3D <1888000>; + regulator-initial-mode =3D ; + }; + vreg_l1c: ldo1 { regulator-name =3D "vreg_l1c"; regulator-min-microvolt =3D <1800000>; @@ -583,6 +669,23 @@ &pcie4_phy { status =3D "okay"; }; =20 +&pcie4_port0 { + wifi@0 { + compatible =3D "pci17cb,1103"; + reg =3D <0x10000 0x0 0x0 0x0 0x0>; + + vddrfacmn-supply =3D <&vreg_pmu_rfa_cmn_0p8>; + vddaon-supply =3D <&vreg_pmu_aon_0p8>; + vddwlcx-supply =3D <&vreg_pmu_wlcx_0p8>; + vddwlmx-supply =3D <&vreg_pmu_wlmx_0p8>; + vddpcie1p8-supply =3D <&vreg_pmu_pcie_1p8>; + vddpcie0p9-supply =3D <&vreg_pmu_pcie_0p9>; + vddrfa0p8-supply =3D <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply =3D <&vreg_pmu_rfa_1p2>; + vddrfa1p8-supply =3D <&vreg_pmu_rfa_1p7>; + }; +}; + &pmc8280c_lpg { status =3D "okay"; }; @@ -829,6 +932,12 @@ reset-pins { }; }; =20 + wlan_en: wlan-en-state { + pins =3D "gpio134"; + function =3D "gpio"; + bias-pull-down; + }; + nvme_reg_en: nvme-reg-en-state { pins =3D "gpio135"; function =3D "gpio"; --=20 2.43.0 From nobody Fri Dec 19 12:06:24 2025 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 A37001B983A for ; Tue, 3 Sep 2024 09:36:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725356204; cv=none; b=HvYVDxdOaNr/hDh5u0SzWkyUysvUo5MHYOqPlMgQdhR8a3MU3r7XfJGpqYska/CqlMubjI5vjqlz6KZBxfs60+DtNwk6OjIW8vC8dISB2H2H+Er4BkObB8dUx7+GRqh3WCQEhW6CUPjUK0eP899lrOktJx4DU44QBJ34hfmgpbU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725356204; c=relaxed/simple; bh=togQe/GGq6SziZ6T0fB/y/Kop1Ebns5gKjzqMfo6/x0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z8MSBixtosuEsqcaHQ25c0LUKgdCABLHOm7IhkYaG4Yupf+ROt55uKrzGp4mmbNTse1Fa5Em1r1wETP78AdxFfurP1WZ9ljKEY5efg9uEoxuIwIsBECFfpcG3/dD40H4ZGraRYQj0eIpBtBkPOO2Dj1hG9EgABwc8X/vPvvdHyk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=3SA3FyRP; arc=none smtp.client-ip=209.85.221.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="3SA3FyRP" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-374c5bab490so1308154f8f.1 for ; Tue, 03 Sep 2024 02:36:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1725356201; x=1725961001; 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=SYq6vD5N4uatwT7apnc7QKBLGGoT0UMnQ2xnutkqvDU=; b=3SA3FyRPk65aXPzq+btZ6wdGOxbvQwhdRwcZFTy0bsBeVKrCs1mypMn7yLKtasVy8Q ZPdwLC5yr7ywwrotjyYvCwlT43Xh4auIx3JH0BnJHaGBukRDPAP8Rki3n5x0ahkVrfM2 wDyStOE/sYFHSbp7mtYkLmE1kdOBgYBBSrO9eJHSH53K/m5kWzBFDLr6hcbRleVcYPPW lk7ogX55Upll8bwt3Si/Y8GHZ8vWnN7C4PvDY70bZqDIIYl5oGN8zsWIG981maS8emQy 3NIwYspouBiswKeqbLGP394GHPmRteOnAomR6eGlfdywTyyD767nyWs5rkbaMz0MhM5B 4Udw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725356201; x=1725961001; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SYq6vD5N4uatwT7apnc7QKBLGGoT0UMnQ2xnutkqvDU=; b=hM8S4MQ4545BF5WRGoSiPAP+HHeb8cuCtQnCMPCJ0hV9IBx9DrCm9qPSyBjQBIfLEu OdKc4K3CNSXmnQ37wwwdh8KLiw4EZNC7X2PkjxDSlFIMq7ly3crUQxt4f3aezVQWsTWF h16SfX2gXJjkeolaMx7v2sXh7g9q4pnPo35dU0CY7PI2/gluWy94NmAVuv5c08GF/VfH 0zGna//RvN919Ty14949By73kzrc0FfaVU4sCru4SWZ2/RZEA3cRGVplXVAa5m5vkZGX OV9lk4/q2Mt66gE5nGMCH7T3UxmwMfzCaQ9QdWZC2a7XZoIp96zC2DB7sHEdh8+gRfLm zaLw== X-Forwarded-Encrypted: i=1; AJvYcCV4VnLqxdT3ywwenH5NedZQhGIKxrC4IJX3o9cYRN8lWyt8UFn9Dyn7l6EbqvhXv0wM3NwaRfyVxRaVHck=@vger.kernel.org X-Gm-Message-State: AOJu0Ywr4KyNYxAd5fbYp44WsOr6IjAGOkYwBLxkgoh/eFuhhqfZZzOS smDSN0cgGgWaikXwJhTm+eyfquO+5L6fm3qeiBc7+Wir3ZIb0RvoM+bel3mUg1g= X-Google-Smtp-Source: AGHT+IFBqUWAg139WelJyM5R44QX5Qh0Z/xq+H7PA7Cur/H88ost1X+Rjoch/L1MyvyD7ispzQel/A== X-Received: by 2002:a5d:6d06:0:b0:374:d24f:7a24 with SMTP id ffacd0b85a97d-374d24f7ae3mr2757756f8f.24.1725356200649; Tue, 03 Sep 2024 02:36:40 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:e61d:37d0:a59f:d06f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-376914bfca1sm790793f8f.18.2024.09.03.02.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 02:36:40 -0700 (PDT) From: Bartosz Golaszewski To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 2/3] arm64: dts: qcom: sc8280xp-crd: enable bluetooth Date: Tue, 3 Sep 2024 11:36:27 +0200 Message-ID: <20240903093629.16242-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240903093629.16242-1-brgl@bgdev.pl> References: <20240903093629.16242-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski Add the bluetooth node for sc8280xp-crd and make it consume the outputs from the PMU as per the new DT bindings contract. Signed-off-by: Bartosz Golaszewski Reviewed-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 59 ++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dt= s/qcom/sc8280xp-crd.dts index ec6bed8395b1..eac3a6ce0b65 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -20,6 +20,7 @@ aliases { i2c4 =3D &i2c4; i2c21 =3D &i2c21; serial0 =3D &uart17; + serial1 =3D &uart2; }; =20 backlight: backlight { @@ -275,7 +276,7 @@ usb1_sbu_mux: endpoint { wcn6855-pmu { compatible =3D "qcom,wcn6855-pmu"; =20 - pinctrl-0 =3D <&wlan_en>; + pinctrl-0 =3D <&bt_en>, <&wlan_en>; pinctrl-names =3D "default"; =20 wlan-enable-gpios =3D <&tlmm 134 GPIO_ACTIVE_HIGH>; @@ -746,6 +747,27 @@ &sdc2 { status =3D "okay"; }; =20 +&uart2 { + pinctrl-0 =3D <&uart2_default>; + pinctrl-names =3D "default"; + + status =3D "okay"; + + bluetooth { + compatible =3D "qcom,wcn6855-bt"; + + vddrfacmn-supply =3D <&vreg_pmu_rfa_cmn_0p8>; + vddaon-supply =3D <&vreg_pmu_aon_0p8>; + vddwlcx-supply =3D <&vreg_pmu_wlcx_0p8>; + vddwlmx-supply =3D <&vreg_pmu_wlmx_0p8>; + vddbtcmx-supply =3D <&vreg_pmu_btcmx_0p8>; + vddrfa0p8-supply =3D <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply =3D <&vreg_pmu_rfa_1p2>; + vddrfa1p8-supply =3D <&vreg_pmu_rfa_1p7>; + }; +}; + + &uart17 { compatible =3D "qcom,geni-debug-uart"; =20 @@ -891,6 +913,13 @@ hastings_reg_en: hastings-reg-en-state { &tlmm { gpio-reserved-ranges =3D <74 6>, <83 4>, <125 2>, <128 2>, <154 7>; =20 + bt_en: bt-en-state { + pins =3D "gpio133"; + function =3D "gpio"; + drive-strength =3D <16>; + bias-disable; + }; + edp_reg_en: edp-reg-en-state { pins =3D "gpio25"; function =3D "gpio"; @@ -1090,6 +1119,34 @@ reset-n-pins { }; }; =20 + uart2_default: uart2-default-state { + cts-pins { + pins =3D "gpio121"; + function =3D "qup2"; + bias-bus-hold; + }; + + rts-pins { + pins =3D "gpio122"; + function =3D "qup2"; + drive-strength =3D <2>; + bias-disable; + }; + + rx-pins { + pins =3D "gpio124"; + function =3D "qup2"; + bias-pull-up; + }; + + tx-pins { + pins =3D "gpio123"; + function =3D "qup2"; + drive-strength =3D <2>; + bias-disable; + }; + }; + usb0_sbu_default: usb0-sbu-state { oe-n-pins { pins =3D "gpio101"; --=20 2.43.0 From nobody Fri Dec 19 12:06:24 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 DA7491AD256 for ; Tue, 3 Sep 2024 09:36:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725356206; cv=none; b=kIKkfmhajIQSHg/FPqxzPGCR7hHaaKh9YEb0brdP6fxgbxvZegLII1hnUn7gbghmN3QR7rBkQ71+8idslzEAGnQyrLkIBC4kiP4ksd9BzRlZdvLSTnZi0um/vKa6ECq24TlXdAoGWv9B5kv6cVwF1y7ED/DXNKKYlGAMgivfmEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725356206; c=relaxed/simple; bh=UDY8mN7NLkOQeS1dWllQkhgyygy99CoGI6WWaVJHSv0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UKheFQmSV5r7FNZqdIhtbHkLmb+RwcZPZcP4TOXHEhZH9gKNjn/nRUzNe86/u0vDz7h+QoMDS3LfqMyEGMTMpQYK5cTzmo8EMZTQWTIhtSRy9UTDv7zg8KCt8ESph3B0E1hoVoLbZn1ZN3A90tumbx8qzQvJ3LjLQMeL5jsQu7s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=re7qty/c; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="re7qty/c" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-42c7bc97423so29278605e9.0 for ; Tue, 03 Sep 2024 02:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1725356202; x=1725961002; 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=wpoQwlpkGQNE662npRSFJddFIL23SgdklNOB5QSDny8=; b=re7qty/csErTHOrZPVzqlyVw0tBtVKZlLwhdNbzd7pa33GM5pn6U5UXQPW25d/YGwI kzuGVMR/4m/ShCed8zEL88z3SdcI1Vg47Q+vGuyWE4ik3w31lthtln/kmLHqcwLM3gQN aPCaWgDKb9BmX6U40SD9oEJIz8js1d4AYEUrHvInPe34dP0LzP/vtnrZtWAtgLMCpH8f Nt0B+/JHZV7CTlxR0E8zSriwJoexv4PToYVopXGeA9esQg7Ipgd3e35kvLOV1elD+Nzt GMFp7C4et4SHAnhmLFANh/ZTJ9hjGhHVc3aqWbHO1F04mnlj3cCNeo/FbELuzPyf99OU iY1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725356202; x=1725961002; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wpoQwlpkGQNE662npRSFJddFIL23SgdklNOB5QSDny8=; b=uifz24FuwW+amnGUur2ULbIA783KRH00FRwt5trmry1ZHQu6nwqbF7PmyR+Q9Iu/nH nbxDnTccdlu0IjE01ZHKvIbJ4zJ2n3uBGYNb1uvpI3pEZdgPKYxP1TnHwNbclC3OBNLp uBmbaapVdT1Gvo5AeeeFo9jHNZ5h6BxjE60idBXr3Ar5U9jcWEX0/f5xmATJMt/CrpBL lk7oxcsVTQPMVOSVU8InamzCY56DYCcuUpU/gW32AkWmUWr4fAXeKiH25Nh7L8wNi8Fb phEOm9ibCH004clYbIN8Nj22aG0/4ty8Uu5wTe7kVqvAx1KdmM0sbZFzr9+pPnRgasOU 6T2A== X-Forwarded-Encrypted: i=1; AJvYcCWgW97nRYiFcO04Q77BJvl/Y/AENmauY3nlFtNcPbZpGmwJkNFUXB1IPjw30iuV8aKzS49FoZBawcqoUVY=@vger.kernel.org X-Gm-Message-State: AOJu0YxNAngmSkx1wpXpDN3hHCFsXrZUaFGnh2TMuLs2QplwYku/Ni6g PqnPZALxA+MJUZE0DPaZvqKupZj1sSEO6vo2xE9scTR5hWCwdRG3+Y/lp6xEiTc= X-Google-Smtp-Source: AGHT+IG20/vMr5jO3sKFFFJav6yaQrsxk/jjUlMdrKQn/ggqADpoZqnLaMRYzeuxybOr8SZG4u5HAw== X-Received: by 2002:a05:600c:1548:b0:426:59d3:8cae with SMTP id 5b1f17b1804b1-42bb01b9302mr149065675e9.13.1725356201956; Tue, 03 Sep 2024 02:36:41 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:e61d:37d0:a59f:d06f]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-376914bfca1sm790793f8f.18.2024.09.03.02.36.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2024 02:36:41 -0700 (PDT) From: Bartosz Golaszewski To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Steev Klimaszewski Subject: [PATCH v2 3/3] arm64: dts: qcom: sc8280xp-x13s: model the PMU of the on-board wcn6855 Date: Tue, 3 Sep 2024 11:36:28 +0200 Message-ID: <20240903093629.16242-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240903093629.16242-1-brgl@bgdev.pl> References: <20240903093629.16242-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Bartosz Golaszewski Add a node for the PMU of the WCN6855 and rework the inputs of the wifi and bluetooth nodes to consume the PMU's outputs. Tested-by: Steev Klimaszewski # Thinkpad X13s Signed-off-by: Bartosz Golaszewski --- .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 98 ++++++++++++++++--- 1 file changed, 86 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/a= rch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 6a28cab97189..88b31550f9df 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -400,6 +400,67 @@ usb1_sbu_mux: endpoint { }; }; }; + + wcn6855-pmu { + compatible =3D "qcom,wcn6855-pmu"; + + pinctrl-0 =3D <&wlan_en>; + pinctrl-names =3D "default"; + + wlan-enable-gpios =3D <&tlmm 134 GPIO_ACTIVE_HIGH>; + bt-enable-gpios =3D <&tlmm 133 GPIO_ACTIVE_HIGH>; + + vddio-supply =3D <&vreg_s10b>; + vddaon-supply =3D <&vreg_s12b>; + vddpmu-supply =3D <&vreg_s12b>; + vddrfa0p95-supply =3D <&vreg_s12b>; + vddrfa1p3-supply =3D <&vreg_s11b>; + vddrfa1p9-supply =3D <&vreg_s1c>; + vddpcie1p3-supply =3D <&vreg_s11b>; + vddpcie1p9-supply =3D <&vreg_s1c>; + + regulators { + vreg_pmu_rfa_cmn_0p8: ldo0 { + regulator-name =3D "vreg_pmu_rfa_cmn_0p8"; + }; + + vreg_pmu_aon_0p8: ldo1 { + regulator-name =3D "vreg_pmu_aon_0p8"; + }; + + vreg_pmu_wlcx_0p8: ldo2 { + regulator-name =3D "vreg_pmu_wlcx_0p8"; + }; + + vreg_pmu_wlmx_0p8: ldo3 { + regulator-name =3D "vreg_pmu_wlmx_0p8"; + }; + + vreg_pmu_btcmx_0p8: ldo4 { + regulator-name =3D "vreg_pmu_btcmx_0p8"; + }; + + vreg_pmu_pcie_1p8: ldo5 { + regulator-name =3D "vreg_pmu_pcie_1p8"; + }; + + vreg_pmu_pcie_0p9: ldo6 { + regulator-name =3D "vreg_pmu_pcie_0p9"; + }; + + vreg_pmu_rfa_0p8: ldo7 { + regulator-name =3D "vreg_pmu_rfa_0p8"; + }; + + vreg_pmu_rfa_1p2: ldo8 { + regulator-name =3D "vreg_pmu_rfa_1p2"; + }; + + vreg_pmu_rfa_1p7: ldo9 { + regulator-name =3D "vreg_pmu_rfa_1p7"; + }; + }; + }; }; =20 &apps_rsc { @@ -927,6 +988,16 @@ wifi@0 { compatible =3D "pci17cb,1103"; reg =3D <0x10000 0x0 0x0 0x0 0x0>; =20 + vddrfacmn-supply =3D <&vreg_pmu_rfa_cmn_0p8>; + vddaon-supply =3D <&vreg_pmu_aon_0p8>; + vddwlcx-supply =3D <&vreg_pmu_wlcx_0p8>; + vddwlmx-supply =3D <&vreg_pmu_wlmx_0p8>; + vddpcie1p8-supply =3D <&vreg_pmu_pcie_1p8>; + vddpcie0p9-supply =3D <&vreg_pmu_pcie_0p9>; + vddrfa0p8-supply =3D <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply =3D <&vreg_pmu_rfa_1p2>; + vddrfa1p8-supply =3D <&vreg_pmu_rfa_1p7>; + qcom,ath11k-calibration-variant =3D "LE_X13S"; }; }; @@ -1258,20 +1329,16 @@ &uart2 { bluetooth { compatible =3D "qcom,wcn6855-bt"; =20 - vddio-supply =3D <&vreg_s10b>; - vddbtcxmx-supply =3D <&vreg_s12b>; - vddrfacmn-supply =3D <&vreg_s12b>; - vddrfa0p8-supply =3D <&vreg_s12b>; - vddrfa1p2-supply =3D <&vreg_s11b>; - vddrfa1p7-supply =3D <&vreg_s1c>; + vddrfacmn-supply =3D <&vreg_pmu_rfa_cmn_0p8>; + vddaon-supply =3D <&vreg_pmu_aon_0p8>; + vddwlcx-supply =3D <&vreg_pmu_wlcx_0p8>; + vddwlmx-supply =3D <&vreg_pmu_wlmx_0p8>; + vddbtcmx-supply =3D <&vreg_pmu_btcmx_0p8>; + vddrfa0p8-supply =3D <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply =3D <&vreg_pmu_rfa_1p2>; + vddrfa1p8-supply =3D <&vreg_pmu_rfa_1p7>; =20 max-speed =3D <3200000>; - - enable-gpios =3D <&tlmm 133 GPIO_ACTIVE_HIGH>; - swctrl-gpios =3D <&tlmm 132 GPIO_ACTIVE_HIGH>; - - pinctrl-0 =3D <&bt_default>; - pinctrl-names =3D "default"; }; }; =20 @@ -1761,4 +1828,11 @@ reset-pins { bias-disable; }; }; + + wlan_en: wlan-en-state { + pins =3D "gpio134"; + function =3D "gpio"; + drive-strength =3D <8>; + bias-pull-down; + }; }; --=20 2.43.0