From patchwork Mon Sep 30 10:30:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 831618 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 828E3189B80 for ; Mon, 30 Sep 2024 10:30:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727692254; cv=none; b=lOra4l36eXmIupxLBCnMY7DeL39zzpLRVsozU+GqFmIsGq9X59FAIsBGmJFEN76DVRxIgQ6M+8A2L4mhDRC6x/MpfVepouswVR3rfp4HSovUc1paAnZ2fkADUz9PBEtJutOHkP89yLuaQnuFMxroPpGAQBfpcqPyFMt/j1Bo+m0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727692254; c=relaxed/simple; bh=8Quc56uA4clP6rv8vrqIVvbO3p4pT52kel2QIZBsE/4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j0sgsNcvAf/htQZHKHMCh+ed9cwRAocPBmtbCe79CbJdx/rO+MlCh4WyxGqSMccAUKktTIJjTlrteZ/iWvA+mq59qKoCdDuI/SOg2prxQqhSc6QzEQeNzyNUC1PQkAkAwb7rKmDJEu6VtRjgSnZ68R00MaVqr5boYL1YC1iGUO4= 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=PcGyOHFE; arc=none smtp.client-ip=209.85.128.54 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="PcGyOHFE" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-42cb5b3c57eso38263065e9.2 for ; Mon, 30 Sep 2024 03:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1727692251; x=1728297051; 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=8/YmEJ9o875nfK7Wzp3gQTYg59ArmoEYegpeDMuvT4c=; b=PcGyOHFEhT/46BBIsT0CAcLVkn6rSuORSPeqV1fx71jblFpEiLTbOThMfY7P31KLrt FGtW0awbfY4Gb0lXqmdjxvHMyg2fmi0r0s+oaQ1VcFawyPFPlEzk1iVlBvQ5kUUl7KQn nTCEh32oVuPlfAcrXvxOazvOqCDBAPeIS60CoJthCzgYakMELXFKIYl6cT4Gnx4toFr3 IBLL6FHaYTLXKlk/1ZMnqlYDWDXdMfJPgL70Dicon96S5Xh8cIM94vp8LxVqmJUZ1335 szL7yHrgg311N81G83QpLZcgT4XY5gDGrf199rF66lbhEQV4mMPN7BmU46iZ1Mk+txS6 RHDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727692251; x=1728297051; 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=8/YmEJ9o875nfK7Wzp3gQTYg59ArmoEYegpeDMuvT4c=; b=oMZZTbhPArAHIYKwcy9ubGcXdcif2wzGmQBxShC0OBX8F9DEp92qbwdTmAHZ16UPAf zAeq0cOGtf6E759hpHzRJ+faML/f+WNETrB3ttI2iAaaOCFwrM6Px5u0xJTlNHVWk4Zd nCeponD/Nk0OkDRg5iw6WUheH/iZWiBax4NY5NoW6N9biYGJo0+XhP6q5F+Huqm075dt vnAE5NkEu585auhmSGiCH0qBBOEA9aVnIEa6jBBxXG1SxosPc5eIAsypk6MonQbXHU8Z Aop8KGcz/5ng/xfg1soCvQM26ZUdoh2rmjxj4vLSWxIoSsZyz/TPthSPmnb2ydQlQ+Ic SjlQ== X-Gm-Message-State: AOJu0Yx8E0jOLuRwYkGUvnNltS2Qkk+MY0yCcqo8GJWbZZCfcbHVofOP po7ELei01V+zLzBWyt7LluN6xJ8I9C1gsjyK9HDa0512wggM7AnZPI6V3RRfil4= X-Google-Smtp-Source: AGHT+IEDzzlb4qi2IBa5FgjP1xeBOaZRJvU+5Y8B8sOe6ReUvlf0Lhzasd95cx6bWAbhOPXvuEqt1g== X-Received: by 2002:adf:e70e:0:b0:37c:cdb2:c057 with SMTP id ffacd0b85a97d-37cd5ad0ef6mr6852390f8f.45.1727692250746; Mon, 30 Sep 2024 03:30:50 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:8791:e3e5:a9ca:31a6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd55a5414sm8835051f8f.0.2024.09.30.03.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 03:30:49 -0700 (PDT) From: Bartosz Golaszewski To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kalle Valo Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov , Bartosz Golaszewski Subject: [PATCH v4 1/3] arm64: dts: qcom: sc8280xp-crd: model the PMU of the on-board wcn6855 Date: Mon, 30 Sep 2024 12:30:37 +0200 Message-ID: <20240930103041.49229-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240930103041.49229-1-brgl@bgdev.pl> References: <20240930103041.49229-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. Reviewed-by: Dmitry Baryshkov 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 --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 110 ++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index 6020582b0a59..28721570c59f 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; }; + vreg_s10b: regulator-s10b { + compatible = "regulator-fixed"; + + regulator-name = "VREG_S10B"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + + regulator-always-on; + regulator-boot-on; + }; + vreg_wlan: regulator-wlan { compatible = "regulator-fixed"; @@ -260,6 +271,66 @@ usb1_sbu_mux: endpoint { }; }; }; + + wcn6855-pmu { + compatible = "qcom,wcn6855-pmu"; + + pinctrl-0 = <&wlan_en>; + pinctrl-names = "default"; + + wlan-enable-gpios = <&tlmm 134 GPIO_ACTIVE_HIGH>; + + vddio-supply = <&vreg_s10b>; + vddaon-supply = <&vreg_s12b>; + vddpmu-supply = <&vreg_s12b>; + vddrfa0p95-supply = <&vreg_s12b>; + vddrfa1p3-supply = <&vreg_s11b>; + vddrfa1p9-supply = <&vreg_s1c>; + vddpcie1p3-supply = <&vreg_s11b>; + vddpcie1p9-supply = <&vreg_s1c>; + + regulators { + vreg_pmu_rfa_cmn_0p8: ldo0 { + regulator-name = "vreg_pmu_rfa_cmn_0p8"; + }; + + vreg_pmu_aon_0p8: ldo1 { + regulator-name = "vreg_pmu_aon_0p8"; + }; + + vreg_pmu_wlcx_0p8: ldo2 { + regulator-name = "vreg_pmu_wlcx_0p8"; + }; + + vreg_pmu_wlmx_0p8: ldo3 { + regulator-name = "vreg_pmu_wlmx_0p8"; + }; + + vreg_pmu_btcmx_0p8: ldo4 { + regulator-name = "vreg_pmu_btcmx_0p8"; + }; + + vreg_pmu_pcie_1p8: ldo5 { + regulator-name = "vreg_pmu_pcie_1p8"; + }; + + vreg_pmu_pcie_0p9: ldo6 { + regulator-name = "vreg_pmu_pcie_0p9"; + }; + + vreg_pmu_rfa_0p8: ldo7 { + regulator-name = "vreg_pmu_rfa_0p8"; + }; + + vreg_pmu_rfa_1p2: ldo8 { + regulator-name = "vreg_pmu_rfa_1p2"; + }; + + vreg_pmu_rfa_1p7: ldo9 { + regulator-name = "vreg_pmu_rfa_1p7"; + }; + }; + }; }; &apps_rsc { @@ -276,6 +347,13 @@ vreg_s11b: smps11 { regulator-initial-mode = ; }; + vreg_s12b: smps12 { + regulator-name = "vreg_s12b"; + regulator-min-microvolt = <984000>; + regulator-max-microvolt = <984000>; + regulator-initial-mode = ; + }; + vreg_l3b: ldo3 { regulator-name = "vreg_l3b"; regulator-min-microvolt = <1200000>; @@ -304,6 +382,13 @@ regulators-1 { compatible = "qcom,pm8350c-rpmh-regulators"; qcom,pmic-id = "c"; + vreg_s1c: smps1 { + regulator-name = "vreg_s1c"; + regulator-min-microvolt = <1888000>; + regulator-max-microvolt = <1888000>; + regulator-initial-mode = ; + }; + vreg_l1c: ldo1 { regulator-name = "vreg_l1c"; regulator-min-microvolt = <1800000>; @@ -583,6 +668,25 @@ &pcie4_phy { status = "okay"; }; +&pcie4_port0 { + wifi@0 { + compatible = "pci17cb,1103"; + reg = <0x10000 0x0 0x0 0x0 0x0>; + + vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>; + vddaon-supply = <&vreg_pmu_aon_0p8>; + vddwlcx-supply = <&vreg_pmu_wlcx_0p8>; + vddwlmx-supply = <&vreg_pmu_wlmx_0p8>; + vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>; + vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>; + vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>; + vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>; + + qcom,ath11k-calibration-variant = "QC_8280XP_CRD"; + }; +}; + &pmc8280c_lpg { status = "okay"; }; @@ -829,6 +933,12 @@ reset-pins { }; }; + wlan_en: wlan-en-state { + pins = "gpio134"; + function = "gpio"; + bias-pull-down; + }; + nvme_reg_en: nvme-reg-en-state { pins = "gpio135"; function = "gpio"; From patchwork Mon Sep 30 10:30:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 832013 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 7529C18BC00 for ; Mon, 30 Sep 2024 10:30:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727692256; cv=none; b=rBg9QbjCQBzvsAOQKIrzW/emwDW3RA+RCAvpCUVqRRbxhkylhyiXLM+/wug47y6WUEYFnFOZhB7SLj9rkV3mmdBxS5h73TGxXxoXolGnbKkJRWtAV+L/QhrrRdk2jDPizS+gDGO7I1Rm8AJi1OjnOYEGF9NBvwNcK5anCp3rqzM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727692256; c=relaxed/simple; bh=z4OTCnuC4b/PxGRdBA3ScXQQSanWoNuzXbQ0PxFnuUQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IxEJEMEnv+yW7SDqJISyDe+Cd5pj6EpPbXcX4gQga30mGzqkQhYwe/Cs5WWrsTVhSJ1tj6jt9oFhWCG2zhkSyd3opDkbHtxAGoFTnxB86KbuCGS9R1o3Yz6iZMA6GCmTb37iHJ6XhM/oYH7KmEYv+mCsbiAI5/4OgwJpoGoearc= 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=OVCf6QhK; arc=none smtp.client-ip=209.85.221.51 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="OVCf6QhK" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-37ccc600466so1787340f8f.1 for ; Mon, 30 Sep 2024 03:30:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1727692253; x=1728297053; 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=dLuE6Kt3jND6zsj6ih54O9B6soObllB8kH8sl+QVpiI=; b=OVCf6QhKTLAdNzd8HdV5KeHnLpHIqD1knVHgWYwQE6J6kQVoGKN8g/ZMh/LahLAu7S +gBZ4x5AJV+8raE+W8KFS+6wyq78Bg+jsk1TFQ4KypCy/Gt0DQVuQYAu/WayxqbmtxR0 T0eo+OuWmL1LgMSLhbZe1FTtxONcA6UTbDQeKvzGcHJMW/N6Em8an5YjEFLnuKXs/U36 afkBd24LAocZujuhvK1egATnI8OGI20JDvhzp98VwBZIebw3jbuJ60tIVR7eGdt8Qz5f 4Yml/fYUMy+xAR9QHE0r4u5NOD4gzAU1HwuQfyJcbsFSj6hkto9NJ5inCsiSF+t2Hnlg XXkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727692253; x=1728297053; 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=dLuE6Kt3jND6zsj6ih54O9B6soObllB8kH8sl+QVpiI=; b=VjiAEfmWjaVoRb4OSjr93mHWKA/vBAbYDfvRFsWYtgp7aBjon7UiF3yhfRe+Yswaz2 GUZovNVqg/0G3jXlKqKuJ489Llx+1Vz9o7xAwO04PVr+dpylPihE+u9JluDLK5jp05hC ZMhsClRNxGf0u8n9upbUJscUZFCECYqZH3xMFLdhzJ/GpSR1y+XVTi4BKSVv+8M09OFG H+/Yx8TsIlxUbfNDo48AjETdomKgSXYziUqP4ODdocG1y2JPGfIqLiYKl/KxDk8LQJNL D5g/gB6FacOXR4ZqXsgO3yF5qqFCCDlU22tIZk9GHYXW8dyfNCJUUzx39b/razhBS24Z 7+0A== X-Gm-Message-State: AOJu0YzEO9xk8LfyMFVwe+Xdum6KdAVAbqE3vBmRAbJzESodWAfO+RQq tajer6u2t6l8yJ62DNaXoAKBz8mwmCZa2tYFzB6RqIGGoKIRx4V8znzY8ROAKVc= X-Google-Smtp-Source: AGHT+IGj28uwxU/n46idJB00cek8od4LkzHfcNT5QP/eTd8Cm3jw+UKDEVe4rhhl1exsV4JnemjLYA== X-Received: by 2002:a5d:420d:0:b0:37c:ccbe:39aa with SMTP id ffacd0b85a97d-37cd5b1088fmr6148057f8f.49.1727692252722; Mon, 30 Sep 2024 03:30:52 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:8791:e3e5:a9ca:31a6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd55a5414sm8835051f8f.0.2024.09.30.03.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 03:30:51 -0700 (PDT) From: Bartosz Golaszewski To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kalle Valo Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Dmitry Baryshkov Subject: [PATCH v4 2/3] arm64: dts: qcom: sc8280xp-crd: enable bluetooth Date: Mon, 30 Sep 2024 12:30:38 +0200 Message-ID: <20240930103041.49229-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240930103041.49229-1-brgl@bgdev.pl> References: <20240930103041.49229-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. Reviewed-by: Dmitry Baryshkov Signed-off-by: Bartosz Golaszewski --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 60 ++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index 28721570c59f..109d7cc5ee4a 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 = &i2c4; i2c21 = &i2c21; serial0 = &uart17; + serial1 = &uart2; }; backlight: backlight { @@ -275,10 +276,11 @@ usb1_sbu_mux: endpoint { wcn6855-pmu { compatible = "qcom,wcn6855-pmu"; - pinctrl-0 = <&wlan_en>; + pinctrl-0 = <&bt_en>, <&wlan_en>; pinctrl-names = "default"; wlan-enable-gpios = <&tlmm 134 GPIO_ACTIVE_HIGH>; + bt-enable-gpios = <&tlmm 133 GPIO_ACTIVE_HIGH>; vddio-supply = <&vreg_s10b>; vddaon-supply = <&vreg_s12b>; @@ -747,6 +749,27 @@ &sdc2 { status = "okay"; }; +&uart2 { + pinctrl-0 = <&uart2_default>; + pinctrl-names = "default"; + + status = "okay"; + + bluetooth { + compatible = "qcom,wcn6855-bt"; + + vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>; + vddaon-supply = <&vreg_pmu_aon_0p8>; + vddwlcx-supply = <&vreg_pmu_wlcx_0p8>; + vddwlmx-supply = <&vreg_pmu_wlmx_0p8>; + vddbtcmx-supply = <&vreg_pmu_btcmx_0p8>; + vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>; + vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>; + }; +}; + + &uart17 { compatible = "qcom,geni-debug-uart"; @@ -892,6 +915,13 @@ hastings_reg_en: hastings-reg-en-state { &tlmm { gpio-reserved-ranges = <74 6>, <83 4>, <125 2>, <128 2>, <154 7>; + bt_en: bt-en-state { + pins = "gpio133"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + }; + edp_reg_en: edp-reg-en-state { pins = "gpio25"; function = "gpio"; @@ -1091,6 +1121,34 @@ reset-n-pins { }; }; + uart2_default: uart2-default-state { + cts-pins { + pins = "gpio121"; + function = "qup2"; + bias-bus-hold; + }; + + rts-pins { + pins = "gpio122"; + function = "qup2"; + drive-strength = <2>; + bias-disable; + }; + + rx-pins { + pins = "gpio124"; + function = "qup2"; + bias-pull-up; + }; + + tx-pins { + pins = "gpio123"; + function = "qup2"; + drive-strength = <2>; + bias-disable; + }; + }; + usb0_sbu_default: usb0-sbu-state { oe-n-pins { pins = "gpio101"; From patchwork Mon Sep 30 10:30:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 831617 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 4C4A118CBF5 for ; Mon, 30 Sep 2024 10:30:56 +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=1727692257; cv=none; b=cnyZA2oKF+rEBTByPQpGBwWSKys1MY4kPYQpQ4XYES9E8XCyJsKNYRH6awpv0E79pJ5tyAcVqB/lKaAN1ihtIN/01GZL1rkIewZ9Uckj/sGReaqR76tzwBwapRdXoml+kavGTWnD7Qgn4PU1sgOd9WIPSUt/BVNE9gF+wnWZA8g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727692257; c=relaxed/simple; bh=XqjaR/d+4nA4AF+LZTpoGqHhkUJy91Jwj67qG0Wq6ho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=imGc+QzeFN/JTpN6liOCSeYVf+0+op0XiWPBl7MPd+DeZjbWiCFwwkvK/zEd/2cZbzyZX069oIPDHk4You08TXjoHqa0VZoQVBe3MzL7i3sYQLnBUQDXgJxvMRXOL8ZkefUMX0Tn0x+sG1NILDpT+//b6RHCR8VY+kNKApHxZ24= 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=uABbopjg; 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="uABbopjg" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-37cce5b140bso2725899f8f.3 for ; Mon, 30 Sep 2024 03:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1727692255; x=1728297055; 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=GW/QJNJ8nNrd40FA3cHMy88AWtEH7wB7y90tYnC9J0E=; b=uABbopjgU3TU22EVUdZgwKgeeTdkJmVxWGCmndtiBemCcIGDGE5JV/WDqG9ACbxmgZ 2e3ARk5ltRmOgpsNTuxMRKLk/Dm0UvyaJCWXFCkrscPGUrJkBoOumFejGiXhKDnsjVc3 m0LB8ZIymOcuJS13NWl838sTXeoiCmXLxY8kyUWYxp80XabSkZz/fdZg+ueGNuEhtsCx TpZFdzDxFr3Z3nfzvvYxEWH1EsjFoO/plKQxfcZY+jwBmjM/JDdkOv8e/5nqEjHjbGIf +lg8TP0tzMWalOmGgvr7/E8Bk6US6fD1GvlyXKfO7cX01BeJrvzWxAzmqVqRad7NFdyd P6Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727692255; x=1728297055; 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=GW/QJNJ8nNrd40FA3cHMy88AWtEH7wB7y90tYnC9J0E=; b=MgEOYp6r4JDnXLZc5H1gCpAshtGfrD/SrJTqlNK531XXt6aM02vXbuOUwCLwPwaONa 53/+RVqTtB+pcsn8jgCaBjJW5fe2y4A5AzHNGW6F/MVIBZUaE3xsX0OsygE6dbCwLUk0 e8l1VRupYmhtoy6qI8kGhknC3BOwg+bUWo2qWKbW2TQBLNfxb3r2hIlMINZqlRcsiF50 MKOkewsydFkq9IH+/d7lLyJmkV8gGhtTQTlpPwFgjdEskdr8eQX6ojuwE4dxwZK0GprQ CDhB6xIoQGVSE2nscbqSjvx7cc4FD0sdrmGPZi424DHe1JBzgPC1ipf/uaEFqkEYW/E/ 8zjg== X-Gm-Message-State: AOJu0YwxJ4WcuqyL236K24WIgEvY4uSz19qs5370x/niLC4GqaH2YCsa i/k3iCm2FQh3w6pTECbcT2Ql4DHk2jBKfKCxaAgzehyvM2YhtByCLXXMC5sACmIMuFOCy2b8MCZ y X-Google-Smtp-Source: AGHT+IFT/KiDXB2vyRF0VhSogHyTD4Xzls+HpKnh4lVIK6Ax8vju52xL/HVQuWpE1ertMMwB1PhjVQ== X-Received: by 2002:a5d:6791:0:b0:37c:d001:856d with SMTP id ffacd0b85a97d-37cd5b106d5mr6051416f8f.42.1727692254562; Mon, 30 Sep 2024 03:30:54 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:dc:7e00:8791:e3e5:a9ca:31a6]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd55a5414sm8835051f8f.0.2024.09.30.03.30.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2024 03:30:53 -0700 (PDT) From: Bartosz Golaszewski To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Kalle Valo Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Steev Klimaszewski Subject: [PATCH v4 3/3] arm64: dts: qcom: sc8280xp-x13s: model the PMU of the on-board wcn6855 Date: Mon, 30 Sep 2024 12:30:39 +0200 Message-ID: <20240930103041.49229-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240930103041.49229-1-brgl@bgdev.pl> References: <20240930103041.49229-1-brgl@bgdev.pl> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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. With this we can drop the regulator-always-on properties from vreg_s11b and vreg_s12b as they will now be enabled by the power sequencing driver. Tested-by: Steev Klimaszewski # Thinkpad X13s Signed-off-by: Bartosz Golaszewski --- .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 100 +++++++++++++++--- 1 file changed, 86 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 6a28cab97189..7230d5420199 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 = "qcom,wcn6855-pmu"; + + pinctrl-0 = <&bt_default>, <&wlan_en>; + pinctrl-names = "default"; + + wlan-enable-gpios = <&tlmm 134 GPIO_ACTIVE_HIGH>; + bt-enable-gpios = <&tlmm 133 GPIO_ACTIVE_HIGH>; + + vddio-supply = <&vreg_s10b>; + vddaon-supply = <&vreg_s12b>; + vddpmu-supply = <&vreg_s12b>; + vddrfa0p95-supply = <&vreg_s12b>; + vddrfa1p3-supply = <&vreg_s11b>; + vddrfa1p9-supply = <&vreg_s1c>; + vddpcie1p3-supply = <&vreg_s11b>; + vddpcie1p9-supply = <&vreg_s1c>; + + regulators { + vreg_pmu_rfa_cmn_0p8: ldo0 { + regulator-name = "vreg_pmu_rfa_cmn_0p8"; + }; + + vreg_pmu_aon_0p8: ldo1 { + regulator-name = "vreg_pmu_aon_0p8"; + }; + + vreg_pmu_wlcx_0p8: ldo2 { + regulator-name = "vreg_pmu_wlcx_0p8"; + }; + + vreg_pmu_wlmx_0p8: ldo3 { + regulator-name = "vreg_pmu_wlmx_0p8"; + }; + + vreg_pmu_btcmx_0p8: ldo4 { + regulator-name = "vreg_pmu_btcmx_0p8"; + }; + + vreg_pmu_pcie_1p8: ldo5 { + regulator-name = "vreg_pmu_pcie_1p8"; + }; + + vreg_pmu_pcie_0p9: ldo6 { + regulator-name = "vreg_pmu_pcie_0p9"; + }; + + vreg_pmu_rfa_0p8: ldo7 { + regulator-name = "vreg_pmu_rfa_0p8"; + }; + + vreg_pmu_rfa_1p2: ldo8 { + regulator-name = "vreg_pmu_rfa_1p2"; + }; + + vreg_pmu_rfa_1p7: ldo9 { + regulator-name = "vreg_pmu_rfa_1p7"; + }; + }; + }; }; &apps_rsc { @@ -426,7 +487,6 @@ vreg_s11b: smps11 { regulator-min-microvolt = <1272000>; regulator-max-microvolt = <1272000>; regulator-initial-mode = ; - regulator-always-on; }; vreg_s12b: smps12 { @@ -434,7 +494,6 @@ vreg_s12b: smps12 { regulator-min-microvolt = <984000>; regulator-max-microvolt = <984000>; regulator-initial-mode = ; - regulator-always-on; }; vreg_l1b: ldo1 { @@ -927,6 +986,16 @@ wifi@0 { compatible = "pci17cb,1103"; reg = <0x10000 0x0 0x0 0x0 0x0>; + vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>; + vddaon-supply = <&vreg_pmu_aon_0p8>; + vddwlcx-supply = <&vreg_pmu_wlcx_0p8>; + vddwlmx-supply = <&vreg_pmu_wlmx_0p8>; + vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>; + vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>; + vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>; + vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>; + qcom,ath11k-calibration-variant = "LE_X13S"; }; }; @@ -1258,20 +1327,16 @@ &uart2 { bluetooth { compatible = "qcom,wcn6855-bt"; - vddio-supply = <&vreg_s10b>; - vddbtcxmx-supply = <&vreg_s12b>; - vddrfacmn-supply = <&vreg_s12b>; - vddrfa0p8-supply = <&vreg_s12b>; - vddrfa1p2-supply = <&vreg_s11b>; - vddrfa1p7-supply = <&vreg_s1c>; + vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>; + vddaon-supply = <&vreg_pmu_aon_0p8>; + vddwlcx-supply = <&vreg_pmu_wlcx_0p8>; + vddwlmx-supply = <&vreg_pmu_wlmx_0p8>; + vddbtcmx-supply = <&vreg_pmu_btcmx_0p8>; + vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>; + vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>; max-speed = <3200000>; - - enable-gpios = <&tlmm 133 GPIO_ACTIVE_HIGH>; - swctrl-gpios = <&tlmm 132 GPIO_ACTIVE_HIGH>; - - pinctrl-0 = <&bt_default>; - pinctrl-names = "default"; }; }; @@ -1761,4 +1826,11 @@ reset-pins { bias-disable; }; }; + + wlan_en: wlan-en-state { + pins = "gpio134"; + function = "gpio"; + drive-strength = <8>; + bias-pull-down; + }; };