* [PATCH 0/3] Commonize Glymur regulator settings for fixed rails
@ 2026-10-28 20:04 Konrad Dybcio
2026-10-28 20:04 ` [PATCH 1/3] arm64: dts: qcom: Unify Glymur/Mahua regulator handles Konrad Dybcio
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Konrad Dybcio @ 2026-10-28 20:04 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Dmitry Baryshkov,
Gopikrishna Garmidi
Cc: linux-arm-msm, devicetree, linux-kernel, Konrad Dybcio
Certain rails are predefined and will ALWAYS have to be the same for a
given PMIC configuration (due to electrical and other requirements).
Factor these out to remove a layer of pain when creating DTs and let
one have a better way to reason about the settings across the platform.
Glymur-SiP will be the next target after/if this is accepted
Compile-tested only
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
Konrad Dybcio (3):
arm64: dts: qcom: Unify Glymur/Mahua regulator handles
arm64: dts: qcom: Consolidate Glymur CoB power grid
arm64: dts: qcom: glymur-crd: Drop L4F0
.../dts/qcom/glymur-asus-zenbook-a14-ux3407na.dts | 235 +-----------
.../dts/qcom/glymur-asus-zenbook-a16-ux3607oa.dts | 232 ++++++------
arch/arm64/boot/dts/qcom/glymur-cob.dtsi | 310 ++++++++++++++++
arch/arm64/boot/dts/qcom/glymur-crd.dts | 29 +-
arch/arm64/boot/dts/qcom/glymur-crd.dtsi | 395 +++++---------------
.../boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts | 224 +----------
.../boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts | 333 +++--------------
arch/arm64/boot/dts/qcom/glymur-qcb.dts | 330 +++--------------
arch/arm64/boot/dts/qcom/mahua-crd.dts | 29 +-
.../qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts | 408 ++++-----------------
arch/arm64/boot/dts/qcom/mahua.dtsi | 2 +-
11 files changed, 740 insertions(+), 1787 deletions(-)
---
base-commit: 151a134a4e6ec66f69db8750c66006f5207f7a9d
change-id: 20261028-topic-sip_cob-65df3325ed28
Best regards,
--
Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] arm64: dts: qcom: Unify Glymur/Mahua regulator handles
2026-10-28 20:04 [PATCH 0/3] Commonize Glymur regulator settings for fixed rails Konrad Dybcio
@ 2026-10-28 20:04 ` Konrad Dybcio
2026-10-28 20:04 ` [PATCH 2/3] arm64: dts: qcom: Consolidate Glymur CoB power grid Konrad Dybcio
2026-10-28 20:04 ` [PATCH 3/3] arm64: dts: qcom: glymur-crd: Drop L4F0 Konrad Dybcio
2 siblings, 0 replies; 5+ messages in thread
From: Konrad Dybcio @ 2026-10-28 20:04 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Dmitry Baryshkov,
Gopikrishna Garmidi
Cc: linux-arm-msm, devicetree, linux-kernel, Konrad Dybcio
From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
In preparation for removing on-SoC invariants from each device's DT,
start with aligning the regulator names and phandles to the format that
appears on schematics.
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
.../dts/qcom/glymur-asus-zenbook-a16-ux3607oa.dts | 232 +++++++++---------
arch/arm64/boot/dts/qcom/glymur-crd.dts | 42 ++--
arch/arm64/boot/dts/qcom/glymur-crd.dtsi | 230 +++++++++---------
.../boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts | 178 +++++++-------
.../boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts | 224 ++++++++---------
arch/arm64/boot/dts/qcom/glymur-qcb.dts | 172 ++++++-------
arch/arm64/boot/dts/qcom/mahua-crd.dts | 30 +--
.../qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts | 266 ++++++++++-----------
8 files changed, 687 insertions(+), 687 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/glymur-asus-zenbook-a16-ux3607oa.dts b/arch/arm64/boot/dts/qcom/glymur-asus-zenbook-a16-ux3607oa.dts
index 95da35125d75..e42e6c43f6a3 100644
--- a/arch/arm64/boot/dts/qcom/glymur-asus-zenbook-a16-ux3607oa.dts
+++ b/arch/arm64/boot/dts/qcom/glymur-asus-zenbook-a16-ux3607oa.dts
@@ -334,7 +334,7 @@ platform {
wlan-connector {
compatible = "pcie-m2-e-connector";
vpcie3v3-supply = <&vreg_wcn_3p3>;
- vpcie1v8-supply = <&vreg_l15b_e0>;
+ vpcie1v8-supply = <&vreg_l15b0>;
w-disable1-gpios = <&tlmm 117 GPIO_ACTIVE_LOW>;
w-disable2-gpios = <&tlmm 116 GPIO_ACTIVE_LOW>;
@@ -377,71 +377,71 @@ regulators-0 {
compatible = "qcom,pmh0101-rpmh-regulators";
qcom,pmic-id = "B_E0";
- vreg_l1b_e0: ldo1 {
- regulator-name = "vreg_l1b_e0";
+ vreg_l1b0: ldo1 {
+ regulator-name = "vreg_l1b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
/* Unused */
- vreg_l2b_e0: ldo2 {
- regulator-name = "vreg_l2b_e0";
+ vreg_l2b0: ldo2 {
+ regulator-name = "vreg_l2b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
- vreg_l6b_e0: ldo6 {
- regulator-name = "vreg_l6b_e0";
+ vreg_l6b0: ldo6 {
+ regulator-name = "vreg_l6b0";
regulator-min-microvolt = <3304000>;
regulator-max-microvolt = <3304000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l7b_e0: ldo7 {
- regulator-name = "vreg_l7b_e0";
+ vreg_l7b0: ldo7 {
+ regulator-name = "vreg_l7b0";
regulator-min-microvolt = <3072000>;
regulator-max-microvolt = <3072000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l8b_e0: ldo8 {
- regulator-name = "vreg_l8b_e0";
+ vreg_l8b0: ldo8 {
+ regulator-name = "vreg_l8b0";
regulator-min-microvolt = <3304000>;
regulator-max-microvolt = <3304000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
/* Unused */
- vreg_l9b_e0: ldo9 {
- regulator-name = "vreg_l9b_e0";
+ vreg_l9b0: ldo9 {
+ regulator-name = "vreg_l9b0";
regulator-min-microvolt = <2960000>;
regulator-max-microvolt = <2960000>;
};
- vreg_l10b_e0: ldo10 {
- regulator-name = "vreg_l10b_e0";
+ vreg_l10b0: ldo10 {
+ regulator-name = "vreg_l10b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l11b_e0: ldo11 {
- regulator-name = "vreg_l11b_e0";
+ vreg_l11b0: ldo11 {
+ regulator-name = "vreg_l11b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
/* Unused */
- vreg_l12b_e0: ldo12 {
- regulator-name = "vreg_l12b_e0";
+ vreg_l12b0: ldo12 {
+ regulator-name = "vreg_l12b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
- vreg_l15b_e0: ldo15 {
- regulator-name = "vreg_l15b_e0";
+ vreg_l15b0: ldo15 {
+ regulator-name = "vreg_l15b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -450,14 +450,14 @@ vreg_l15b_e0: ldo15 {
};
/* Unused */
- vreg_l17b_e0: ldo17 {
- regulator-name = "vreg_l17b_e0";
+ vreg_l17b0: ldo17 {
+ regulator-name = "vreg_l17b0";
regulator-min-microvolt = <2504000>;
regulator-max-microvolt = <2504000>;
};
- vreg_l18b_e0: ldo18 {
- regulator-name = "vreg_l18b_e0";
+ vreg_l18b0: ldo18 {
+ regulator-name = "vreg_l18b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -471,22 +471,22 @@ regulators-1 {
compatible = "qcom,pmcx0102-rpmh-regulators";
qcom,pmic-id = "C_E0";
- vreg_l1c_e0: ldo1 {
- regulator-name = "vreg_l1c_e0";
+ vreg_l1c0: ldo1 {
+ regulator-name = "vreg_l1c0";
regulator-min-microvolt = <936000>;
regulator-max-microvolt = <936000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2c_e0: ldo2 {
- regulator-name = "vreg_l2c_e0";
+ vreg_l2c0: ldo2 {
+ regulator-name = "vreg_l2c0";
regulator-min-microvolt = <880000>;
regulator-max-microvolt = <880000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4c_e0: ldo4 {
- regulator-name = "vreg_l4c_e0";
+ vreg_l4c0: ldo4 {
+ regulator-name = "vreg_l4c0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -498,29 +498,29 @@ regulators-2 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E0";
- vreg_s7f_e0: smps7 {
- regulator-name = "vreg_s7f_e0";
+ vreg_s7f0: smps7 {
+ regulator-name = "vreg_s7f0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_s8f_e0: smps8 {
- regulator-name = "vreg_s8f_e0";
+ vreg_s8f0: smps8 {
+ regulator-name = "vreg_s8f0";
regulator-min-microvolt = <952000>;
regulator-max-microvolt = <952000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e0: ldo2 {
- regulator-name = "vreg_l2f_e0";
+ vreg_l2f0: ldo2 {
+ regulator-name = "vreg_l2f0";
regulator-min-microvolt = <936000>;
regulator-max-microvolt = <936000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3f_e0: ldo3 {
- regulator-name = "vreg_l3f_e0";
+ vreg_l3f0: ldo3 {
+ regulator-name = "vreg_l3f0";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -531,29 +531,29 @@ regulators-3 {
compatible = "qcom,pmcx0102-rpmh-regulators";
qcom,pmic-id = "C_E1";
- vreg_l1c_e1: ldo1 {
- regulator-name = "vreg_l1c_e1";
+ vreg_l1c1: ldo1 {
+ regulator-name = "vreg_l1c1";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2c_e1: ldo2 {
- regulator-name = "vreg_l2c_e1";
+ vreg_l2c1: ldo2 {
+ regulator-name = "vreg_l2c1";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3c_e1: ldo3 {
- regulator-name = "vreg_l3c_e1";
+ vreg_l3c1: ldo3 {
+ regulator-name = "vreg_l3c1";
regulator-min-microvolt = <936000>;
regulator-max-microvolt = <936000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4c_e1: ldo4 {
- regulator-name = "vreg_l4c_e1";
+ vreg_l4c1: ldo4 {
+ regulator-name = "vreg_l4c1";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -565,22 +565,22 @@ regulators-4 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E1";
- vreg_l1f_e1: ldo1 {
- regulator-name = "vreg_l1f_e1";
+ vreg_l1f1: ldo1 {
+ regulator-name = "vreg_l1f1";
regulator-min-microvolt = <904000>;
regulator-max-microvolt = <904000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e1: ldo2 {
- regulator-name = "vreg_l2f_e1";
+ vreg_l2f1: ldo2 {
+ regulator-name = "vreg_l2f1";
regulator-min-microvolt = <880000>;
regulator-max-microvolt = <880000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4f_e1: ldo4 {
- regulator-name = "vreg_l4f_e1";
+ vreg_l4f1: ldo4 {
+ regulator-name = "vreg_l4f1";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -627,8 +627,8 @@ ptn3222_1: redriver@43 {
reset-gpios = <&tlmm 184 GPIO_ACTIVE_LOW>;
- vdd3v3-supply = <&vreg_l8b_e0>;
- vdd1v8-supply = <&vreg_l15b_e0>;
+ vdd3v3-supply = <&vreg_l8b0>;
+ vdd1v8-supply = <&vreg_l15b0>;
#phy-cells = <0>;
};
@@ -639,8 +639,8 @@ ptn3222_0: redriver@4f {
reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;
- vdd3v3-supply = <&vreg_l8b_e0>;
- vdd1v8-supply = <&vreg_l15b_e0>;
+ vdd3v3-supply = <&vreg_l8b0>;
+ vdd1v8-supply = <&vreg_l15b0>;
#phy-cells = <0>;
};
@@ -732,7 +732,7 @@ misc_3p3_reg_en: misc-3p3-reg-en-state {
};
&lpass_vamacro {
- vdd-micb-supply = <&vreg_l1b_e0>;
+ vdd-micb-supply = <&vreg_l1b0>;
pinctrl-0 = <&dmic01_default>;
pinctrl-names = "default";
@@ -802,8 +802,8 @@ &mdss_dp3_out {
};
&mdss_dp3_phy {
- vdda-phy-supply = <&vreg_l2f_e1>;
- vdda-pll-supply = <&vreg_l4f_e1>;
+ vdda-phy-supply = <&vreg_l2f1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -816,8 +816,8 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c_e1>;
- vdda-pll-supply = <&vreg_l4f_e1>;
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -841,8 +841,8 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f_e0>;
- vdda-pll-supply = <&vreg_l4c_e0>;
+ vdda-phy-supply = <&vreg_l2f0>;
+ vdda-pll-supply = <&vreg_l4c0>;
status = "okay";
};
@@ -884,13 +884,13 @@ &remoteproc_soccp {
};
&smb2370_j_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0>;
- vdd3-supply = <&vreg_l7b_e0>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
};
&smb2370_k_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0>;
- vdd3-supply = <&vreg_l7b_e0>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
};
&swr0 {
@@ -903,8 +903,8 @@ left_woofer: speaker@0,0 {
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "WooferLeft";
- vdd-1p8-supply = <&vreg_l15b_e0>;
- vdd-io-supply = <&vreg_l18b_e0>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <1 2 3 7 12 14>;
};
@@ -915,8 +915,8 @@ left_tweeter: speaker@0,1 {
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "TweeterLeft";
- vdd-1p8-supply = <&vreg_l15b_e0>;
- vdd-io-supply = <&vreg_l18b_e0>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <4 5 6 7 13 15>;
};
};
@@ -931,8 +931,8 @@ right_woofer: speaker@0,0 {
reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "WooferRight";
- vdd-1p8-supply = <&vreg_l15b_e0>;
- vdd-io-supply = <&vreg_l18b_e0>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <1 2 3 7 12 14>;
};
@@ -943,30 +943,30 @@ right_tweeter: speaker@0,1 {
reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "TweeterRight";
- vdd-1p8-supply = <&vreg_l15b_e0>;
- vdd-io-supply = <&vreg_l18b_e0>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <4 5 6 7 13 15>;
};
};
&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2c_e0>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2c_e0>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2c_e0>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f_e0>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f_e0>;
- vdda-qreftx0-1p2-supply = <&vreg_l4c_e0>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f_e1>;
- vdda-refgen3-0p9-supply = <&vreg_l2f_e0>;
- vdda-refgen3-1p2-supply = <&vreg_l4c_e0>;
- vdda-refgen4-0p9-supply = <&vreg_l1f_e1>;
- vdda-refgen4-1p2-supply = <&vreg_l4f_e1>;
+ vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt3-0p9-supply = <&vreg_l2c0>;
+ vdda-qrefrpt4-0p9-supply = <&vreg_l2c0>;
+ vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx4-0p9-supply = <&vreg_l2c0>;
+ vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-1p2-supply = <&vreg_l4c0>;
+ vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen3-0p9-supply = <&vreg_l2f0>;
+ vdda-refgen3-1p2-supply = <&vreg_l4c0>;
+ vdda-refgen4-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen4-1p2-supply = <&vreg_l4f1>;
};
&tlmm {
@@ -1151,8 +1151,8 @@ &usb_0_dwc3_hs {
};
&usb_0_hsphy {
- vdd-supply = <&vreg_l3f_e0>;
- vdda12-supply = <&vreg_l4c_e0>;
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4c0>;
phys = <&smb2370_j_e2_eusb2_repeater>;
@@ -1160,9 +1160,9 @@ &usb_0_hsphy {
};
&usb_0_qmpphy {
- vdda-phy-supply = <&vreg_l3f_e0>;
- vdda-pll-supply = <&vreg_l4c_e0>;
- refgen-supply = <&vreg_l2f_e0>;
+ vdda-phy-supply = <&vreg_l3f0>;
+ vdda-pll-supply = <&vreg_l4c0>;
+ refgen-supply = <&vreg_l2f0>;
status = "okay";
};
@@ -1180,8 +1180,8 @@ &usb_1_dwc3_hs {
};
&usb_1_hsphy {
- vdd-supply = <&vreg_l3f_e0>;
- vdda12-supply = <&vreg_l4c_e0>;
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4c0>;
phys = <&smb2370_k_e2_eusb2_repeater>;
@@ -1189,9 +1189,9 @@ &usb_1_hsphy {
};
&usb_1_qmpphy {
- vdda-phy-supply = <&vreg_l1c_e0>;
- vdda-pll-supply = <&vreg_l4c_e0>;
- refgen-supply = <&vreg_l2f_e0>;
+ vdda-phy-supply = <&vreg_l1c0>;
+ vdda-pll-supply = <&vreg_l4c0>;
+ refgen-supply = <&vreg_l2f0>;
status = "okay";
};
@@ -1201,9 +1201,9 @@ &usb_1_qmpphy_out {
};
&usb_2_qmpphy {
- vdda-phy-supply = <&vreg_l4c_e1>;
- vdda-pll-supply = <&vreg_l4f_e1>;
- refgen-supply = <&vreg_l4f_e1>;
+ vdda-phy-supply = <&vreg_l4c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
+ refgen-supply = <&vreg_l4f1>;
/delete-property/ mode-switch;
/delete-property/ orientation-switch;
@@ -1233,8 +1233,8 @@ &usb_mp {
/* MP0 (eUSB3 + USBSS3) -> Type-A port */
&usb_mp_hsphy0 {
- vdd-supply = <&vreg_l2c_e0>;
- vdda12-supply = <&vreg_l4c_e0>;
+ vdd-supply = <&vreg_l2c0>;
+ vdda12-supply = <&vreg_l4c0>;
phys = <&ptn3222_0>;
@@ -1243,8 +1243,8 @@ &usb_mp_hsphy0 {
/* MP1 (eUSB6 + USBSS4) -> RTS5329 SD Card reader */
&usb_mp_hsphy1 {
- vdd-supply = <&vreg_l2c_e0>;
- vdda12-supply = <&vreg_l4c_e0>;
+ vdd-supply = <&vreg_l2c0>;
+ vdda12-supply = <&vreg_l4c0>;
phys = <&ptn3222_1>;
@@ -1252,17 +1252,17 @@ &usb_mp_hsphy1 {
};
&usb_mp_qmpphy0 {
- vdda-phy-supply = <&vreg_l2c_e0>;
- vdda-pll-supply = <&vreg_l4c_e0>;
- refgen-supply = <&vreg_l4f_e1>;
+ vdda-phy-supply = <&vreg_l2c0>;
+ vdda-pll-supply = <&vreg_l4c0>;
+ refgen-supply = <&vreg_l4f1>;
status = "okay";
};
&usb_mp_qmpphy1 {
- vdda-phy-supply = <&vreg_l2c_e0>;
- vdda-pll-supply = <&vreg_l4c_e0>;
- refgen-supply = <&vreg_l4f_e1>;
+ vdda-phy-supply = <&vreg_l2c0>;
+ vdda-pll-supply = <&vreg_l4c0>;
+ refgen-supply = <&vreg_l4f1>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/glymur-crd.dts b/arch/arm64/boot/dts/qcom/glymur-crd.dts
index b8e3fedcdea8..dfac99056bcd 100644
--- a/arch/arm64/boot/dts/qcom/glymur-crd.dts
+++ b/arch/arm64/boot/dts/qcom/glymur-crd.dts
@@ -30,29 +30,29 @@ &mdss_dp1_out {
};
&pcie3_phy {
- vdda-phy-supply = <&vreg_l3c_e1_0p89>;
- vdda-pll-supply = <&vreg_l2c_e1_1p14>;
+ vdda-phy-supply = <&vreg_l3c1>;
+ vdda-pll-supply = <&vreg_l2c1>;
- vdda-refgen0p9-supply = <&vreg_l1c_e1_0p82>;
- vdda-refgen1p2-supply = <&vreg_l4f_e1_1p08>;
+ vdda-refgen0p9-supply = <&vreg_l1c1>;
+ vdda-refgen1p2-supply = <&vreg_l4f1>;
};
&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f_e0_0p72>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f_e0_0p72>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h_e0_1p2>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f_e1_0p82>;
- vdda-refgen3-0p9-supply = <&vreg_l2f_e0_0p82>;
- vdda-refgen3-1p2-supply = <&vreg_l4h_e0_1p2>;
- vdda-refgen4-0p9-supply = <&vreg_l1f_e1_0p82>;
- vdda-refgen4-1p2-supply = <&vreg_l4f_e1_1p08>;
+ vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
+ vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen3-0p9-supply = <&vreg_l2f0>;
+ vdda-refgen3-1p2-supply = <&vreg_l4h0>;
+ vdda-refgen4-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen4-1p2-supply = <&vreg_l4f1>;
};
diff --git a/arch/arm64/boot/dts/qcom/glymur-crd.dtsi b/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
index 58158b51fe29..4744bcb3c123 100644
--- a/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
+++ b/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
@@ -289,11 +289,11 @@ wcn7850-pmu {
compatible = "qcom,wcn7850-pmu";
vdd-supply = <&vreg_wcn_0p95>;
- vddio-supply = <&vreg_l15b_e0_1p8>;
- vddaon-supply = <&vreg_l15b_e0_1p8>;
- vdddig-supply = <&vreg_l15b_e0_1p8>;
- vddrfa1p2-supply = <&vreg_l15b_e0_1p8>;
- vddrfa1p8-supply = <&vreg_l15b_e0_1p8>;
+ vddio-supply = <&vreg_l15b0>;
+ vddaon-supply = <&vreg_l15b0>;
+ vdddig-supply = <&vreg_l15b0>;
+ vddrfa1p2-supply = <&vreg_l15b0>;
+ vddrfa1p8-supply = <&vreg_l15b0>;
wlan-enable-gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
bt-enable-gpios = <&tlmm 116 GPIO_ACTIVE_HIGH>;
@@ -364,78 +364,78 @@ vreg_bob2_e0: bob2 {
regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
};
- vreg_l1b_e0_1p8: ldo1 {
- regulator-name = "vreg_l1b_e0_1p8";
+ vreg_l1b0: ldo1 {
+ regulator-name = "vreg_l1b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2b_e0_2p9: ldo2 {
- regulator-name = "vreg_l2b_e0_2p9";
+ vreg_l2b0: ldo2 {
+ regulator-name = "vreg_l2b0";
regulator-min-microvolt = <1804000>;
regulator-max-microvolt = <2904000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l7b_e0_2p79: ldo7 {
- regulator-name = "vreg_l7b_e0_2p79";
+ vreg_l7b0: ldo7 {
+ regulator-name = "vreg_l7b0";
regulator-min-microvolt = <2790000>;
regulator-max-microvolt = <2792000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l8b_e0_1p50: ldo8 {
- regulator-name = "vreg_l8b_e0_1p50";
+ vreg_l8b0: ldo8 {
+ regulator-name = "vreg_l8b0";
regulator-min-microvolt = <1504000>;
regulator-max-microvolt = <1504000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l9b_e0_2p9: ldo9 {
- regulator-name = "vreg_l9b_e0_2p9";
+ vreg_l9b0: ldo9 {
+ regulator-name = "vreg_l9b0";
regulator-min-microvolt = <2960000>;
regulator-max-microvolt = <2960000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l10b_e0_1p8: ldo10 {
- regulator-name = "vreg_l10b_e0_1p8";
+ vreg_l10b0: ldo10 {
+ regulator-name = "vreg_l10b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l11b_e0_1p2: ldo11 {
- regulator-name = "vreg_l11b_e0_1p2";
+ vreg_l11b0: ldo11 {
+ regulator-name = "vreg_l11b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l12b_e0_1p14: ldo12 {
- regulator-name = "vreg_l12b_e0_1p14";
+ vreg_l12b0: ldo12 {
+ regulator-name = "vreg_l12b0";
regulator-min-microvolt = <1144000>;
regulator-max-microvolt = <1144000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l15b_e0_1p8: ldo15 {
- regulator-name = "vreg_l15b_e0_1p8";
+ vreg_l15b0: ldo15 {
+ regulator-name = "vreg_l15b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l17b_e0_2p4: ldo17 {
- regulator-name = "vreg_l17b_e0_2p4";
+ vreg_l17b0: ldo17 {
+ regulator-name = "vreg_l17b0";
regulator-min-microvolt = <2400000>;
regulator-max-microvolt = <2700000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l18b_e0_1p2: ldo18 {
- regulator-name = "vreg_l18b_e0_1p2";
+ vreg_l18b0: ldo18 {
+ regulator-name = "vreg_l18b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -446,29 +446,29 @@ regulators-1 {
compatible = "qcom,pmcx0102-rpmh-regulators";
qcom,pmic-id = "C_E1";
- vreg_l1c_e1_0p82: ldo1 {
- regulator-name = "vreg_l1c_e1_0p82";
+ vreg_l1c1: ldo1 {
+ regulator-name = "vreg_l1c1";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2c_e1_1p14: ldo2 {
- regulator-name = "vreg_l2c_e1_1p14";
+ vreg_l2c1: ldo2 {
+ regulator-name = "vreg_l2c1";
regulator-min-microvolt = <1144000>;
regulator-max-microvolt = <1144000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3c_e1_0p89: ldo3 {
- regulator-name = "vreg_l3c_e1_0p89";
+ vreg_l3c1: ldo3 {
+ regulator-name = "vreg_l3c1";
regulator-min-microvolt = <890000>;
regulator-max-microvolt = <980000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4c_e1_0p72: ldo4 {
- regulator-name = "vreg_l4c_e1_0p72";
+ vreg_l4c1: ldo4 {
+ regulator-name = "vreg_l4c1";
regulator-min-microvolt = <720000>;
regulator-max-microvolt = <720000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -479,43 +479,43 @@ regulators-2 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E0";
- vreg_s7f_e0_1p32: smps7 {
- regulator-name = "vreg_s7f_e0_1p32";
+ vreg_s7f0: smps7 {
+ regulator-name = "vreg_s7f0";
regulator-min-microvolt = <1320000>;
regulator-max-microvolt = <1352000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_s8f_e0_0p95: smps8 {
- regulator-name = "vreg_s8f_e0_0p95";
+ vreg_s8f0: smps8 {
+ regulator-name = "vreg_s8f0";
regulator-min-microvolt = <952000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_s9f_e0_1p9: smps9 {
- regulator-name = "vreg_s9f_e0_1p9";
+ vreg_s9f0: smps9 {
+ regulator-name = "vreg_s9f0";
regulator-min-microvolt = <1900000>;
regulator-max-microvolt = <2000000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e0_0p82: ldo2 {
- regulator-name = "vreg_l2f_e0_0p82";
+ vreg_l2f0: ldo2 {
+ regulator-name = "vreg_l2f0";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3f_e0_0p72: ldo3 {
- regulator-name = "vreg_l3f_e0_0p72";
+ vreg_l3f0: ldo3 {
+ regulator-name = "vreg_l3f0";
regulator-min-microvolt = <720000>;
regulator-max-microvolt = <720000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4f_e0_0p3: ldo4 {
- regulator-name = "vreg_l4f_e0_0p3";
+ vreg_l4f0: ldo4 {
+ regulator-name = "vreg_l4f0";
regulator-min-microvolt = <1080000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -526,29 +526,29 @@ regulators-3 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E1";
- vreg_s7f_e1_0p3: smps7 {
- regulator-name = "vreg_s7f_e1_0p3";
+ vreg_s7f1: smps7 {
+ regulator-name = "vreg_s7f1";
regulator-min-microvolt = <300000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l1f_e1_0p82: ldo1 {
- regulator-name = "vreg_l1f_e1_0p82";
+ vreg_l1f1: ldo1 {
+ regulator-name = "vreg_l1f1";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e1_0p83: ldo2 {
- regulator-name = "vreg_l2f_e1_0p83";
+ vreg_l2f1: ldo2 {
+ regulator-name = "vreg_l2f1";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4f_e1_1p08: ldo4 {
- regulator-name = "vreg_l4f_e1_1p08";
+ vreg_l4f1: ldo4 {
+ regulator-name = "vreg_l4f1";
regulator-min-microvolt = <1080000>;
regulator-max-microvolt = <1320000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -559,29 +559,29 @@ regulators-4 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "H_E0";
- vreg_l1h_e0_0p89: ldo1 {
- regulator-name = "vreg_l1h_e0_0p89";
+ vreg_l1h0: ldo1 {
+ regulator-name = "vreg_l1h0";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2h_e0_0p72: ldo2 {
- regulator-name = "vreg_l2h_e0_0p72";
+ vreg_l2h0: ldo2 {
+ regulator-name = "vreg_l2h0";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3h_e0_0p32: ldo3 {
- regulator-name = "vreg_l3h_e0_0p32";
+ vreg_l3h0: ldo3 {
+ regulator-name = "vreg_l3h0";
regulator-min-microvolt = <320000>;
regulator-max-microvolt = <2000000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4h_e0_1p2: ldo4 {
- regulator-name = "vreg_l4h_e0_1p2";
+ vreg_l4h0: ldo4 {
+ regulator-name = "vreg_l4h0";
regulator-min-microvolt = <1080000>;
regulator-max-microvolt = <1320000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -618,7 +618,7 @@ touchpad@2c {
interrupts-extended = <&tlmm 3 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
- vddl-supply = <&vreg_l15b_e0_1p8>;
+ vddl-supply = <&vreg_l15b0>;
pinctrl-0 = <&tpad_default>;
pinctrl-names = "default";
@@ -634,7 +634,7 @@ keyboard@3a {
interrupts-extended = <&tlmm 67 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
- vddl-supply = <&vreg_l15b_e0_1p8>;
+ vddl-supply = <&vreg_l15b0>;
pinctrl-0 = <&kybd_default>;
pinctrl-names = "default";
@@ -654,8 +654,8 @@ ptn3222_0: redriver@43 {
reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;
- vdd3v3-supply = <&vreg_l8b_e0_1p50>;
- vdd1v8-supply = <&vreg_l15b_e0_1p8>;
+ vdd3v3-supply = <&vreg_l8b0>;
+ vdd1v8-supply = <&vreg_l15b0>;
#phy-cells = <0>;
};
@@ -666,8 +666,8 @@ ptn3222_1: redriver@47 {
reset-gpios = <&tlmm 9 GPIO_ACTIVE_LOW>;
- vdd3v3-supply = <&vreg_l8b_e0_1p50>;
- vdd1v8-supply = <&vreg_l15b_e0_1p8>;
+ vdd3v3-supply = <&vreg_l8b0>;
+ vdd1v8-supply = <&vreg_l15b0>;
#phy-cells = <0>;
};
@@ -685,7 +685,7 @@ touchscreen@38 {
interrupts-extended = <&tlmm 51 IRQ_TYPE_LEVEL_LOW>;
vcc33-supply = <&vreg_misc_3p3>;
- vccio-supply = <&vreg_l15b_e0_1p8>;
+ vccio-supply = <&vreg_l15b0>;
reset-gpios = <&tlmm 48 GPIO_ACTIVE_LOW>;
@@ -698,7 +698,7 @@ &lpass_vamacro {
pinctrl-0 = <&dmic01_default>, <&dmic23_default>;
pinctrl-names = "default";
qcom,dmic-sample-rate = <4800000>;
- vdd-micb-supply = <&vreg_l1b_e0_1p8>;
+ vdd-micb-supply = <&vreg_l1b0>;
};
&mdss {
@@ -736,8 +736,8 @@ &mdss_dp3_out {
};
&mdss_dp3_phy {
- vdda-phy-supply = <&vreg_l2f_e1_0p83>;
- vdda-pll-supply = <&vreg_l4f_e1_1p08>;
+ vdda-phy-supply = <&vreg_l2f1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -762,8 +762,8 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c_e1_0p82>;
- vdda-pll-supply = <&vreg_l4f_e1_1p08>;
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -798,8 +798,8 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f_e0_0p82>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
+ vdda-phy-supply = <&vreg_l2f0>;
+ vdda-pll-supply = <&vreg_l4h0>;
status = "okay";
};
@@ -819,8 +819,8 @@ &pcie6 {
};
&pcie6_phy {
- vdda-phy-supply = <&vreg_l1c_e1_0p82>;
- vdda-pll-supply = <&vreg_l4f_e1_1p08>;
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -890,18 +890,18 @@ &remoteproc_cdsp {
};
&smb2370_j_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0_1p8>;
- vdd3-supply = <&vreg_l7b_e0_2p79>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
};
&smb2370_k_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0_1p8>;
- vdd3-supply = <&vreg_l7b_e0_2p79>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
};
&sdhc_2 {
- vmmc-supply = <&vreg_l9b_e0_2p9>;
- vqmmc-supply = <&vreg_l2b_e0_2p9>;
+ vmmc-supply = <&vreg_l9b0>;
+ vqmmc-supply = <&vreg_l2b0>;
pinctrl-0 = <&sdc2_default_state &sdc2_card_det_n>;
pinctrl-1 = <&sdc2_sleep_state &sdc2_card_det_n>;
@@ -925,8 +925,8 @@ left_woofer: speaker@0,0 {
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "WooferLeft";
- vdd-1p8-supply = <&vreg_l15b_e0_1p8>;
- vdd-io-supply = <&vreg_l18b_e0_1p2>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <1 2 3 7 12 14>;
};
@@ -937,8 +937,8 @@ left_tweeter: speaker@0,1 {
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "TweeterLeft";
- vdd-1p8-supply = <&vreg_l15b_e0_1p8>;
- vdd-io-supply = <&vreg_l18b_e0_1p2>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <4 5 6 7 13 15>;
};
};
@@ -953,8 +953,8 @@ right_woofer: speaker@0,0 {
reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "WooferRight";
- vdd-1p8-supply = <&vreg_l15b_e0_1p8>;
- vdd-io-supply = <&vreg_l18b_e0_1p2>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <1 2 3 7 12 14>;
};
@@ -965,8 +965,8 @@ right_tweeter: speaker@0,1 {
reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "TweeterRight";
- vdd-1p8-supply = <&vreg_l15b_e0_1p8>;
- vdd-io-supply = <&vreg_l18b_e0_1p2>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <4 5 6 7 13 15>;
};
};
@@ -1182,8 +1182,8 @@ &usb_0_dwc3_hs {
};
&usb_0_hsphy {
- vdd-supply = <&vreg_l3f_e0_0p72>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&smb2370_j_e2_eusb2_repeater>;
@@ -1191,9 +1191,9 @@ &usb_0_hsphy {
};
&usb_0_qmpphy {
- vdda-phy-supply = <&vreg_l3f_e0_0p72>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l2f_e0_0p82>;
+ vdda-phy-supply = <&vreg_l3f0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l2f0>;
status = "okay";
};
@@ -1211,8 +1211,8 @@ &usb_1_dwc3_hs {
};
&usb_1_hsphy {
- vdd-supply = <&vreg_l3f_e0_0p72>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&smb2370_k_e2_eusb2_repeater>;
@@ -1220,9 +1220,9 @@ &usb_1_hsphy {
};
&usb_1_qmpphy {
- vdda-phy-supply = <&vreg_l1h_e0_0p89>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l2f_e0_0p82>;
+ vdda-phy-supply = <&vreg_l1h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l2f0>;
status = "okay";
};
@@ -1238,8 +1238,8 @@ &usb_hs {
};
&usb_hs_phy {
- vdd-supply = <&vreg_l2h_e0_0p72>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&ptn3222_1>;
@@ -1251,8 +1251,8 @@ &usb_mp {
};
&usb_mp_hsphy0 {
- vdd-supply = <&vreg_l2h_e0_0p72>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&ptn3222_0>;
@@ -1260,24 +1260,24 @@ &usb_mp_hsphy0 {
};
&usb_mp_hsphy1 {
- vdd-supply = <&vreg_l2h_e0_0p72>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
status = "okay";
};
&usb_mp_qmpphy0 {
- vdda-phy-supply = <&vreg_l2h_e0_0p72>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l4f_e1_1p08>;
+ vdda-phy-supply = <&vreg_l2h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l4f1>;
status = "okay";
};
&usb_mp_qmpphy1 {
- vdda-phy-supply = <&vreg_l2h_e0_0p72>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l4f_e1_1p08>;
+ vdda-phy-supply = <&vreg_l2h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l4f1>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts b/arch/arm64/boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts
index 096d40e49210..ef77e70c8af3 100644
--- a/arch/arm64/boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts
+++ b/arch/arm64/boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts
@@ -236,11 +236,11 @@ wcn7850-pmu {
compatible = "qcom,wcn7850-pmu";
vdd-supply = <&vreg_wcn_0p95>;
- vddio-supply = <&vreg_l15b_e0_1p8>;
- vddaon-supply = <&vreg_l15b_e0_1p8>;
- vdddig-supply = <&vreg_l15b_e0_1p8>;
- vddrfa1p2-supply = <&vreg_l15b_e0_1p8>;
- vddrfa1p8-supply = <&vreg_l15b_e0_1p8>;
+ vddio-supply = <&vreg_l15b0>;
+ vddaon-supply = <&vreg_l15b0>;
+ vdddig-supply = <&vreg_l15b0>;
+ vddrfa1p2-supply = <&vreg_l15b0>;
+ vddrfa1p8-supply = <&vreg_l15b0>;
wlan-enable-gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
bt-enable-gpios = <&tlmm 116 GPIO_ACTIVE_HIGH>;
@@ -297,29 +297,29 @@ regulators-0 {
compatible = "qcom,pmh0101-rpmh-regulators";
qcom,pmic-id = "B_E0";
- vreg_l1b_e0_1p8: ldo1 {
- regulator-name = "vreg_l1b_e0_1p8";
+ vreg_l1b0: ldo1 {
+ regulator-name = "vreg_l1b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l7b_e0_3p1: ldo7 {
- regulator-name = "vreg_l7b_e0_3p1";
+ vreg_l7b0: ldo7 {
+ regulator-name = "vreg_l7b0";
regulator-min-microvolt = <3072000>;
regulator-max-microvolt = <3072000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l15b_e0_1p8: ldo15 {
- regulator-name = "vreg_l15b_e0_1p8";
+ vreg_l15b0: ldo15 {
+ regulator-name = "vreg_l15b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l18b_e0_1p2: ldo18 {
- regulator-name = "vreg_l18b_e0_1p2";
+ vreg_l18b0: ldo18 {
+ regulator-name = "vreg_l18b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -330,8 +330,8 @@ regulators-1 {
compatible = "qcom,pmcx0102-rpmh-regulators";
qcom,pmic-id = "C_E1";
- vreg_l1c_e1_0p91: ldo1 {
- regulator-name = "vreg_l1c_e1_0p91";
+ vreg_l1c1: ldo1 {
+ regulator-name = "vreg_l1c1";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -342,15 +342,15 @@ regulators-2 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E0";
- vreg_l2f_e0_0p94: ldo2 {
- regulator-name = "vreg_l2f_e0_0p94";
+ vreg_l2f0: ldo2 {
+ regulator-name = "vreg_l2f0";
regulator-min-microvolt = <936000>;
regulator-max-microvolt = <936000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3f_e0_0p91: ldo3 {
- regulator-name = "vreg_l3f_e0_0p91";
+ vreg_l3f0: ldo3 {
+ regulator-name = "vreg_l3f0";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -361,22 +361,22 @@ regulators-3 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E1";
- vreg_l1f_e1_0p88: ldo1 {
- regulator-name = "vreg_l1f_e1_0p88";
+ vreg_l1f1: ldo1 {
+ regulator-name = "vreg_l1f1";
regulator-min-microvolt = <880000>;
regulator-max-microvolt = <880000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e1_0p88: ldo2 {
- regulator-name = "vreg_l2f_e1_0p88";
+ vreg_l2f1: ldo2 {
+ regulator-name = "vreg_l2f1";
regulator-min-microvolt = <880000>;
regulator-max-microvolt = <880000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4f_e1_1p2: ldo4 {
- regulator-name = "vreg_l4f_e1_1p2";
+ vreg_l4f1: ldo4 {
+ regulator-name = "vreg_l4f1";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -387,22 +387,22 @@ regulators-4 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "H_E0";
- vreg_l1h_e0_0p94: ldo1 {
- regulator-name = "vreg_l1h_e0_0p94";
+ vreg_l1h0: ldo1 {
+ regulator-name = "vreg_l1h0";
regulator-min-microvolt = <936000>;
regulator-max-microvolt = <936000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2h_e0_0p88: ldo2 {
- regulator-name = "vreg_l2h_e0_0p88";
+ vreg_l2h0: ldo2 {
+ regulator-name = "vreg_l2h0";
regulator-min-microvolt = <880000>;
regulator-max-microvolt = <880000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4h_e0_1p2: ldo4 {
- regulator-name = "vreg_l4h_e0_1p2";
+ vreg_l4h0: ldo4 {
+ regulator-name = "vreg_l4h0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -470,7 +470,7 @@ touchscreen@10 {
};
&lpass_vamacro {
- vdd-micb-supply = <&vreg_l1b_e0_1p8>;
+ vdd-micb-supply = <&vreg_l1b0>;
pinctrl-0 = <&dmic01_default>;
pinctrl-names = "default";
@@ -529,8 +529,8 @@ &mdss_dp3_out {
};
&mdss_dp3_phy {
- vdda-phy-supply = <&vreg_l2f_e1_0p88>;
- vdda-pll-supply = <&vreg_l4f_e1_1p2>;
+ vdda-phy-supply = <&vreg_l2f1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -543,8 +543,8 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c_e1_0p91>;
- vdda-pll-supply = <&vreg_l4f_e1_1p2>;
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -579,8 +579,8 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f_e0_0p94>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
+ vdda-phy-supply = <&vreg_l2f0>;
+ vdda-pll-supply = <&vreg_l4h0>;
status = "okay";
};
@@ -625,13 +625,13 @@ &remoteproc_soccp {
};
&smb2370_j_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0_1p8>;
- vdd3-supply = <&vreg_l7b_e0_3p1>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
};
&smb2370_k_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0_1p8>;
- vdd3-supply = <&vreg_l7b_e0_3p1>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
};
&swr0 {
@@ -644,8 +644,8 @@ left_woofer: speaker@0,0 {
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "WooferLeft";
- vdd-1p8-supply = <&vreg_l15b_e0_1p8>;
- vdd-io-supply = <&vreg_l18b_e0_1p2>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <1 2 3 7 12 14>;
};
@@ -656,8 +656,8 @@ left_tweeter: speaker@0,1 {
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "TweeterLeft";
- vdd-1p8-supply = <&vreg_l15b_e0_1p8>;
- vdd-io-supply = <&vreg_l18b_e0_1p2>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <4 5 6 7 13 15>;
};
};
@@ -672,8 +672,8 @@ right_woofer: speaker@0,0 {
reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "WooferRight";
- vdd-1p8-supply = <&vreg_l15b_e0_1p8>;
- vdd-io-supply = <&vreg_l18b_e0_1p2>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <1 2 3 7 12 14>;
};
@@ -684,30 +684,30 @@ right_tweeter: speaker@0,1 {
reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "TweeterRight";
- vdd-1p8-supply = <&vreg_l15b_e0_1p8>;
- vdd-io-supply = <&vreg_l18b_e0_1p2>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <4 5 6 7 13 15>;
};
};
&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f_e1_0p88>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f_e1_0p88>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f_e1_0p88>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h_e0_0p88>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h_e0_0p88>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f_e1_0p88>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f_e1_0p88>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f_e1_0p88>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h_e0_0p88>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f_e0_0p91>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f_e0_0p91>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h_e0_1p2>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f_e1_0p88>;
- vdda-refgen3-0p9-supply = <&vreg_l2f_e0_0p94>;
- vdda-refgen3-1p2-supply = <&vreg_l4h_e0_1p2>;
- vdda-refgen4-0p9-supply = <&vreg_l1f_e1_0p88>;
- vdda-refgen4-1p2-supply = <&vreg_l4f_e1_1p2>;
+ vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
+ vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen3-0p9-supply = <&vreg_l2f0>;
+ vdda-refgen3-1p2-supply = <&vreg_l4h0>;
+ vdda-refgen4-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen4-1p2-supply = <&vreg_l4f1>;
};
&tlmm {
@@ -841,8 +841,8 @@ &usb_0_dwc3_hs {
};
&usb_0_hsphy {
- vdd-supply = <&vreg_l3f_e0_0p91>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&smb2370_j_e2_eusb2_repeater>;
@@ -850,9 +850,9 @@ &usb_0_hsphy {
};
&usb_0_qmpphy {
- vdda-phy-supply = <&vreg_l3f_e0_0p91>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l2f_e0_0p94>;
+ vdda-phy-supply = <&vreg_l3f0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l2f0>;
status = "okay";
};
@@ -870,8 +870,8 @@ &usb_1_dwc3_hs {
};
&usb_1_hsphy {
- vdd-supply = <&vreg_l3f_e0_0p91>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&smb2370_k_e2_eusb2_repeater>;
@@ -879,9 +879,9 @@ &usb_1_hsphy {
};
&usb_1_qmpphy {
- vdda-phy-supply = <&vreg_l1h_e0_0p94>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l2f_e0_0p94>;
+ vdda-phy-supply = <&vreg_l1h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l2f0>;
status = "okay";
};
@@ -898,8 +898,8 @@ &usb_hs {
};
&usb_hs_phy {
- vdd-supply = <&vreg_l2h_e0_0p88>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
status = "okay";
};
@@ -910,31 +910,31 @@ &usb_mp {
};
&usb_mp_hsphy0 {
- vdd-supply = <&vreg_l2h_e0_0p88>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
status = "okay";
};
&usb_mp_hsphy1 {
- vdd-supply = <&vreg_l2h_e0_0p88>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
status = "okay";
};
&usb_mp_qmpphy0 {
- vdda-phy-supply = <&vreg_l2h_e0_0p88>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l4f_e1_1p2>;
+ vdda-phy-supply = <&vreg_l2h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l4f1>;
status = "okay";
};
&usb_mp_qmpphy1 {
- vdda-phy-supply = <&vreg_l2h_e0_0p88>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l4f_e1_1p2>;
+ vdda-phy-supply = <&vreg_l2h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l4f1>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts
index 769f195c99d9..56c22daab056 100644
--- a/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts
+++ b/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts
@@ -320,11 +320,11 @@ wcn7850-pmu {
compatible = "qcom,wcn7850-pmu";
vdd-supply = <&vreg_wcn_0p95>;
- vddio-supply = <&vreg_l15b_e0>;
- vddaon-supply = <&vreg_l15b_e0>;
- vdddig-supply = <&vreg_l15b_e0>;
- vddrfa1p2-supply = <&vreg_l15b_e0>;
- vddrfa1p8-supply = <&vreg_l15b_e0>;
+ vddio-supply = <&vreg_l15b0>;
+ vddaon-supply = <&vreg_l15b0>;
+ vdddig-supply = <&vreg_l15b0>;
+ vddrfa1p2-supply = <&vreg_l15b0>;
+ vddrfa1p8-supply = <&vreg_l15b0>;
wlan-enable-gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
bt-enable-gpios = <&tlmm 116 GPIO_ACTIVE_HIGH>;
@@ -381,71 +381,71 @@ regulators-0 {
compatible = "qcom,pmh0101-rpmh-regulators";
qcom,pmic-id = "B_E0";
- vreg_l1b_e0: ldo1 {
- regulator-name = "vreg_l1b_e0";
+ vreg_l1b0: ldo1 {
+ regulator-name = "vreg_l1b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l7b_e0: ldo7 {
- regulator-name = "vreg_l7b_e0";
+ vreg_l7b0: ldo7 {
+ regulator-name = "vreg_l7b0";
regulator-min-microvolt = <3072000>;
regulator-max-microvolt = <3072000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l8b_e0: ldo8 {
- regulator-name = "vreg_l8b_e0";
+ vreg_l8b0: ldo8 {
+ regulator-name = "vreg_l8b0";
regulator-min-microvolt = <3304000>;
regulator-max-microvolt = <3304000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l9b_e0: ldo9 {
- regulator-name = "vreg_l9b_e0";
+ vreg_l9b0: ldo9 {
+ regulator-name = "vreg_l9b0";
regulator-min-microvolt = <2960000>;
regulator-max-microvolt = <2960000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l10b_e0: ldo10 {
- regulator-name = "vreg_l10b_e0";
+ vreg_l10b0: ldo10 {
+ regulator-name = "vreg_l10b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l11b_e0: ldo11 {
- regulator-name = "vreg_l11b_e0";
+ vreg_l11b0: ldo11 {
+ regulator-name = "vreg_l11b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l12b_e0: ldo12 {
- regulator-name = "vreg_l12b_e0";
+ vreg_l12b0: ldo12 {
+ regulator-name = "vreg_l12b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l15b_e0: ldo15 {
- regulator-name = "vreg_l15b_e0";
+ vreg_l15b0: ldo15 {
+ regulator-name = "vreg_l15b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l17b_e0: ldo17 {
- regulator-name = "vreg_l17b_e0";
+ vreg_l17b0: ldo17 {
+ regulator-name = "vreg_l17b0";
regulator-min-microvolt = <2504000>;
regulator-max-microvolt = <2504000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l18b_e0: ldo18 {
- regulator-name = "vreg_l18b_e0";
+ vreg_l18b0: ldo18 {
+ regulator-name = "vreg_l18b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -456,29 +456,29 @@ regulators-1 {
compatible = "qcom,pmcx0102-rpmh-regulators";
qcom,pmic-id = "C_E1";
- vreg_l1c_e1: ldo1 {
- regulator-name = "vreg_l1c_e1";
+ vreg_l1c1: ldo1 {
+ regulator-name = "vreg_l1c1";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2c_e1: ldo2 {
- regulator-name = "vreg_l2c_e1";
+ vreg_l2c1: ldo2 {
+ regulator-name = "vreg_l2c1";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3c_e1: ldo3 {
- regulator-name = "vreg_l3c_e1";
+ vreg_l3c1: ldo3 {
+ regulator-name = "vreg_l3c1";
regulator-min-microvolt = <936000>;
regulator-max-microvolt = <936000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4c_e1: ldo4 {
- regulator-name = "vreg_l4c_e1";
+ vreg_l4c1: ldo4 {
+ regulator-name = "vreg_l4c1";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -489,29 +489,29 @@ regulators-2 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E0";
- vreg_s7f_e0: smps7 {
- regulator-name = "vreg_s7f_e0";
+ vreg_s7f0: smps7 {
+ regulator-name = "vreg_s7f0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_s8f_e0: smps8 {
- regulator-name = "vreg_s8f_e0";
+ vreg_s8f0: smps8 {
+ regulator-name = "vreg_s8f0";
regulator-min-microvolt = <952000>;
regulator-max-microvolt = <952000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e0: ldo2 {
- regulator-name = "vreg_l2f_e0";
+ vreg_l2f0: ldo2 {
+ regulator-name = "vreg_l2f0";
regulator-min-microvolt = <936000>;
regulator-max-microvolt = <936000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3f_e0: ldo3 {
- regulator-name = "vreg_l3f_e0";
+ vreg_l3f0: ldo3 {
+ regulator-name = "vreg_l3f0";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -522,22 +522,22 @@ regulators-3 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E1";
- vreg_l1f_e1: ldo1 {
- regulator-name = "vreg_l1f_e1";
+ vreg_l1f1: ldo1 {
+ regulator-name = "vreg_l1f1";
regulator-min-microvolt = <880000>;
regulator-max-microvolt = <904000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e1: ldo2 {
- regulator-name = "vreg_l2f_e1";
+ vreg_l2f1: ldo2 {
+ regulator-name = "vreg_l2f1";
regulator-min-microvolt = <880000>;
regulator-max-microvolt = <880000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4f_e1: ldo4 {
- regulator-name = "vreg_l4f_e1";
+ vreg_l4f1: ldo4 {
+ regulator-name = "vreg_l4f1";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -548,29 +548,29 @@ regulators-4 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "H_E0";
- vreg_l1h_e0: ldo1 {
- regulator-name = "vreg_l1h_e0";
+ vreg_l1h0: ldo1 {
+ regulator-name = "vreg_l1h0";
regulator-min-microvolt = <936000>;
regulator-max-microvolt = <936000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2h_e0: ldo2 {
- regulator-name = "vreg_l2h_e0";
+ vreg_l2h0: ldo2 {
+ regulator-name = "vreg_l2h0";
regulator-min-microvolt = <880000>;
regulator-max-microvolt = <880000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3h_e0: ldo3 {
- regulator-name = "vreg_l3h_e0";
+ vreg_l3h0: ldo3 {
+ regulator-name = "vreg_l3h0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4h_e0: ldo4 {
- regulator-name = "vreg_l4h_e0";
+ vreg_l4h0: ldo4 {
+ regulator-name = "vreg_l4h0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -599,7 +599,7 @@ touchpad@2c {
interrupts-extended = <&tlmm 3 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
- vddl-supply = <&vreg_l15b_e0>;
+ vddl-supply = <&vreg_l15b0>;
pinctrl-0 = <&tpad_default>;
pinctrl-names = "default";
@@ -615,7 +615,7 @@ keyboard@3a {
interrupts-extended = <&tlmm 67 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
- vddl-supply = <&vreg_l15b_e0>;
+ vddl-supply = <&vreg_l15b0>;
pinctrl-0 = <&kybd_default>;
pinctrl-names = "default";
@@ -647,7 +647,7 @@ touchscreen@14 {
post-power-on-delay-ms = <200>;
vdd-supply = <&vreg_misc_3p3>;
- vddl-supply = <&vreg_l15b_e0>;
+ vddl-supply = <&vreg_l15b0>;
pinctrl-0 = <&ts0_default>;
pinctrl-names = "default";
@@ -727,8 +727,8 @@ &mdss_dp3_out {
};
&mdss_dp3_phy {
- vdda-phy-supply = <&vreg_l2f_e1>;
- vdda-pll-supply = <&vreg_l4f_e1>;
+ vdda-phy-supply = <&vreg_l2f1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -741,8 +741,8 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c_e1>;
- vdda-pll-supply = <&vreg_l4f_e1>;
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -777,8 +777,8 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f_e0>;
- vdda-pll-supply = <&vreg_l4h_e0>;
+ vdda-phy-supply = <&vreg_l2f0>;
+ vdda-pll-supply = <&vreg_l4h0>;
status = "okay";
};
@@ -798,8 +798,8 @@ &pcie6 {
};
&pcie6_phy {
- vdda-phy-supply = <&vreg_l1c_e1>;
- vdda-pll-supply = <&vreg_l4f_e1>;
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -861,18 +861,18 @@ &remoteproc_soccp {
};
&smb2370_j_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0>;
- vdd3-supply = <&vreg_l7b_e0>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
};
&smb2370_k_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0>;
- vdd3-supply = <&vreg_l7b_e0>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
};
&smb2370_l_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0>;
- vdd3-supply = <&vreg_l7b_e0>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
status = "okay";
};
@@ -887,8 +887,8 @@ left_woofer: speaker@0,0 {
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "WooferLeft";
- vdd-1p8-supply = <&vreg_l15b_e0>;
- vdd-io-supply = <&vreg_l18b_e0>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <1 2 3 7 12 14>;
};
@@ -899,8 +899,8 @@ left_tweeter: speaker@0,1 {
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "TweeterLeft";
- vdd-1p8-supply = <&vreg_l15b_e0>;
- vdd-io-supply = <&vreg_l18b_e0>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <4 5 6 7 13 15>;
};
};
@@ -915,8 +915,8 @@ right_woofer: speaker@0,0 {
reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "WooferRight";
- vdd-1p8-supply = <&vreg_l15b_e0>;
- vdd-io-supply = <&vreg_l18b_e0>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <1 2 3 7 12 14>;
};
@@ -927,30 +927,30 @@ right_tweeter: speaker@0,1 {
reset-gpios = <&lpass_tlmm 13 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "TweeterRight";
- vdd-1p8-supply = <&vreg_l15b_e0>;
- vdd-io-supply = <&vreg_l18b_e0>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <4 5 6 7 13 15>;
};
};
&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h_e0>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h_e0>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f_e1>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h_e0>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f_e0>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f_e0>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h_e0>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f_e1>;
- vdda-refgen3-0p9-supply = <&vreg_l2f_e0>;
- vdda-refgen3-1p2-supply = <&vreg_l4h_e0>;
- vdda-refgen4-0p9-supply = <&vreg_l1f_e1>;
- vdda-refgen4-1p2-supply = <&vreg_l4f_e1>;
+ vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
+ vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen3-0p9-supply = <&vreg_l2f0>;
+ vdda-refgen3-1p2-supply = <&vreg_l4h0>;
+ vdda-refgen4-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen4-1p2-supply = <&vreg_l4f1>;
};
&tlmm {
@@ -1142,8 +1142,8 @@ &usb_0_dwc3_hs {
};
&usb_0_hsphy {
- vdd-supply = <&vreg_l3f_e0>;
- vdda12-supply = <&vreg_l4h_e0>;
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&smb2370_j_e2_eusb2_repeater>;
@@ -1151,9 +1151,9 @@ &usb_0_hsphy {
};
&usb_0_qmpphy {
- vdda-phy-supply = <&vreg_l4h_e0>;
- vdda-pll-supply = <&vreg_l3f_e0>;
- refgen-supply = <&vreg_l2f_e0>;
+ vdda-phy-supply = <&vreg_l4h0>;
+ vdda-pll-supply = <&vreg_l3f0>;
+ refgen-supply = <&vreg_l2f0>;
status = "okay";
};
@@ -1171,8 +1171,8 @@ &usb_1_dwc3_hs {
};
&usb_1_hsphy {
- vdd-supply = <&vreg_l3f_e0>;
- vdda12-supply = <&vreg_l4h_e0>;
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&smb2370_k_e2_eusb2_repeater>;
@@ -1180,9 +1180,9 @@ &usb_1_hsphy {
};
&usb_1_qmpphy {
- vdda-phy-supply = <&vreg_l4h_e0>;
- vdda-pll-supply = <&vreg_l1h_e0>;
- refgen-supply = <&vreg_l2f_e0>;
+ vdda-phy-supply = <&vreg_l4h0>;
+ vdda-pll-supply = <&vreg_l1h0>;
+ refgen-supply = <&vreg_l2f0>;
status = "okay";
};
@@ -1200,8 +1200,8 @@ &usb_2_dwc3_hs {
};
&usb_2_hsphy {
- vdd-supply = <&vreg_l4c_e1>;
- vdda12-supply = <&vreg_l4f_e1>;
+ vdd-supply = <&vreg_l4c1>;
+ vdda12-supply = <&vreg_l4f1>;
phys = <&smb2370_l_e2_eusb2_repeater>;
@@ -1209,9 +1209,9 @@ &usb_2_hsphy {
};
&usb_2_qmpphy {
- vdda-phy-supply = <&vreg_l4f_e1>;
- vdda-pll-supply = <&vreg_l4c_e1>;
- refgen-supply = <&vreg_l1c_e1>;
+ vdda-phy-supply = <&vreg_l4f1>;
+ vdda-pll-supply = <&vreg_l4c1>;
+ refgen-supply = <&vreg_l1c1>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/glymur-qcb.dts b/arch/arm64/boot/dts/qcom/glymur-qcb.dts
index 17d8ff3aed23..3255ad66786e 100644
--- a/arch/arm64/boot/dts/qcom/glymur-qcb.dts
+++ b/arch/arm64/boot/dts/qcom/glymur-qcb.dts
@@ -122,11 +122,11 @@ wcn7850-pmu {
compatible = "qcom,wcn7850-pmu";
vdd-supply = <&vreg_wcn_0p95>;
- vddio-supply = <&vreg_l15b_e0_1p8>;
- vddaon-supply = <&vreg_l15b_e0_1p8>;
- vdddig-supply = <&vreg_l15b_e0_1p8>;
- vddrfa1p2-supply = <&vreg_l15b_e0_1p8>;
- vddrfa1p8-supply = <&vreg_l15b_e0_1p8>;
+ vddio-supply = <&vreg_l15b0>;
+ vddaon-supply = <&vreg_l15b0>;
+ vdddig-supply = <&vreg_l15b0>;
+ vddrfa1p2-supply = <&vreg_l15b0>;
+ vddrfa1p8-supply = <&vreg_l15b0>;
wlan-enable-gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
bt-enable-gpios = <&tlmm 116 GPIO_ACTIVE_HIGH>;
@@ -197,78 +197,78 @@ vreg_bob2_e0: bob2 {
regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
};
- vreg_l1b_e0_1p8: ldo1 {
- regulator-name = "vreg_l1b_e0_1p8";
+ vreg_l1b0: ldo1 {
+ regulator-name = "vreg_l1b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2b_e0_2p9: ldo2 {
- regulator-name = "vreg_l2b_e0_2p9";
+ vreg_l2b0: ldo2 {
+ regulator-name = "vreg_l2b0";
regulator-min-microvolt = <2904000>;
regulator-max-microvolt = <2904000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l7b_e0_2p79: ldo7 {
- regulator-name = "vreg_l7b_e0_2p79";
+ vreg_l7b0: ldo7 {
+ regulator-name = "vreg_l7b0";
regulator-min-microvolt = <2790000>;
regulator-max-microvolt = <2792000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l8b_e0_1p50: ldo8 {
- regulator-name = "vreg_l8b_e0_1p50";
+ vreg_l8b0: ldo8 {
+ regulator-name = "vreg_l8b0";
regulator-min-microvolt = <1504000>;
regulator-max-microvolt = <1504000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l9b_e0_2p7: ldo9 {
- regulator-name = "vreg_l9b_e0_2p7";
+ vreg_l9b0: ldo9 {
+ regulator-name = "vreg_l9b0";
regulator-min-microvolt = <2704000>;
regulator-max-microvolt = <2704000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l10b_e0_1p8: ldo10 {
- regulator-name = "vreg_l10b_e0_1p8";
+ vreg_l10b0: ldo10 {
+ regulator-name = "vreg_l10b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l11b_e0_1p2: ldo11 {
- regulator-name = "vreg_l11b_e0_1p2";
+ vreg_l11b0: ldo11 {
+ regulator-name = "vreg_l11b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l12b_e0_1p14: ldo12 {
- regulator-name = "vreg_l12b_e0_1p14";
+ vreg_l12b0: ldo12 {
+ regulator-name = "vreg_l12b0";
regulator-min-microvolt = <1144000>;
regulator-max-microvolt = <1144000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l15b_e0_1p8: ldo15 {
- regulator-name = "vreg_l15b_e0_1p8";
+ vreg_l15b0: ldo15 {
+ regulator-name = "vreg_l15b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l17b_e0_2p4: ldo17 {
- regulator-name = "vreg_l17b_e0_2p4";
+ vreg_l17b0: ldo17 {
+ regulator-name = "vreg_l17b0";
regulator-min-microvolt = <2400000>;
regulator-max-microvolt = <2700000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l18b_e0_1p2: ldo18 {
- regulator-name = "vreg_l18b_e0_1p2";
+ vreg_l18b0: ldo18 {
+ regulator-name = "vreg_l18b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -279,29 +279,29 @@ regulators-1 {
compatible = "qcom,pmcx0102-rpmh-regulators";
qcom,pmic-id = "C_E1";
- vreg_l1c_e1_0p82: ldo1 {
- regulator-name = "vreg_l1c_e1_0p82";
+ vreg_l1c1: ldo1 {
+ regulator-name = "vreg_l1c1";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2c_e1_1p14: ldo2 {
- regulator-name = "vreg_l2c_e1_1p14";
+ vreg_l2c1: ldo2 {
+ regulator-name = "vreg_l2c1";
regulator-min-microvolt = <1144000>;
regulator-max-microvolt = <1144000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3c_e1_0p89: ldo3 {
- regulator-name = "vreg_l3c_e1_0p89";
+ vreg_l3c1: ldo3 {
+ regulator-name = "vreg_l3c1";
regulator-min-microvolt = <890000>;
regulator-max-microvolt = <980000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4c_e1_0p72: ldo4 {
- regulator-name = "vreg_l4c_e1_0p72";
+ vreg_l4c1: ldo4 {
+ regulator-name = "vreg_l4c1";
regulator-min-microvolt = <720000>;
regulator-max-microvolt = <720000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -312,43 +312,43 @@ regulators-2 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E0";
- vreg_s7f_e0_1p32: smps7 {
- regulator-name = "vreg_s7f_e0_1p32";
+ vreg_s7f0: smps7 {
+ regulator-name = "vreg_s7f0";
regulator-min-microvolt = <1320000>;
regulator-max-microvolt = <1352000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_s8f_e0_0p95: smps8 {
- regulator-name = "vreg_s8f_e0_0p95";
+ vreg_s8f0: smps8 {
+ regulator-name = "vreg_s8f0";
regulator-min-microvolt = <952000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_s9f_e0_1p9: smps9 {
- regulator-name = "vreg_s9f_e0_1p9";
+ vreg_s9f0: smps9 {
+ regulator-name = "vreg_s9f0";
regulator-min-microvolt = <1900000>;
regulator-max-microvolt = <2000000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e0_0p82: ldo2 {
- regulator-name = "vreg_l2f_e0_0p82";
+ vreg_l2f0: ldo2 {
+ regulator-name = "vreg_l2f0";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3f_e0_0p72: ldo3 {
- regulator-name = "vreg_l3f_e0_0p72";
+ vreg_l3f0: ldo3 {
+ regulator-name = "vreg_l3f0";
regulator-min-microvolt = <720000>;
regulator-max-microvolt = <720000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4f_e0_1p08: ldo4 {
- regulator-name = "vreg_l4f_e0_1p08";
+ vreg_l4f0: ldo4 {
+ regulator-name = "vreg_l4f0";
regulator-min-microvolt = <1080000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -359,29 +359,29 @@ regulators-3 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E1";
- vreg_s7f_e1_0p3: smps7 {
- regulator-name = "vreg_s7f_e1_0p3";
+ vreg_s7f1: smps7 {
+ regulator-name = "vreg_s7f1";
regulator-min-microvolt = <300000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l1f_e1_0p82: ldo1 {
- regulator-name = "vreg_l1f_e1_0p82";
+ vreg_l1f1: ldo1 {
+ regulator-name = "vreg_l1f1";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e1_0p83: ldo2 {
- regulator-name = "vreg_l2f_e1_0p83";
+ vreg_l2f1: ldo2 {
+ regulator-name = "vreg_l2f1";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4f_e1_1p08: ldo4 {
- regulator-name = "vreg_l4f_e1_1p08";
+ vreg_l4f1: ldo4 {
+ regulator-name = "vreg_l4f1";
regulator-min-microvolt = <1080000>;
regulator-max-microvolt = <1320000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -392,29 +392,29 @@ regulators-4 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "H_E0";
- vreg_l1h_e0_0p89: ldo1 {
- regulator-name = "vreg_l1h_e0_0p89";
+ vreg_l1h0: ldo1 {
+ regulator-name = "vreg_l1h0";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2h_e0_0p72: ldo2 {
- regulator-name = "vreg_l2h_e0_0p72";
+ vreg_l2h0: ldo2 {
+ regulator-name = "vreg_l2h0";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3h_e0_0p32: ldo3 {
- regulator-name = "vreg_l3h_e0_0p32";
+ vreg_l3h0: ldo3 {
+ regulator-name = "vreg_l3h0";
regulator-min-microvolt = <320000>;
regulator-max-microvolt = <2000000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4h_e0_1p2: ldo4 {
- regulator-name = "vreg_l4h_e0_1p2";
+ vreg_l4h0: ldo4 {
+ regulator-name = "vreg_l4h0";
regulator-min-microvolt = <1080000>;
regulator-max-microvolt = <1320000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -446,8 +446,8 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c_e1_0p82>;
- vdda-pll-supply = <&vreg_l4f_e1_1p08>;
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -482,8 +482,8 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f_e0_0p82>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
+ vdda-phy-supply = <&vreg_l2f0>;
+ vdda-pll-supply = <&vreg_l4h0>;
status = "okay";
};
@@ -503,8 +503,8 @@ &pcie6 {
};
&pcie6_phy {
- vdda-phy-supply = <&vreg_l1c_e1_0p82>;
- vdda-pll-supply = <&vreg_l4f_e1_1p08>;
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -560,23 +560,23 @@ &remoteproc_soccp {
};
&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f_e0_0p72>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f_e0_0p72>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h_e0_1p2>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f_e1_0p82>;
- vdda-refgen3-0p9-supply = <&vreg_l2f_e0_0p82>;
- vdda-refgen3-1p2-supply = <&vreg_l4h_e0_1p2>;
- vdda-refgen4-0p9-supply = <&vreg_l1f_e1_0p82>;
- vdda-refgen4-1p2-supply = <&vreg_l4f_e1_1p08>;
+ vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
+ vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen3-0p9-supply = <&vreg_l2f0>;
+ vdda-refgen3-1p2-supply = <&vreg_l4h0>;
+ vdda-refgen4-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen4-1p2-supply = <&vreg_l4f1>;
};
&tlmm {
diff --git a/arch/arm64/boot/dts/qcom/mahua-crd.dts b/arch/arm64/boot/dts/qcom/mahua-crd.dts
index 17e40f2a6259..51708954f17a 100644
--- a/arch/arm64/boot/dts/qcom/mahua-crd.dts
+++ b/arch/arm64/boot/dts/qcom/mahua-crd.dts
@@ -21,22 +21,22 @@ / {
};
&pcie3b_phy {
- vdda-phy-supply = <&vreg_l3c_e1_0p89>;
- vdda-pll-supply = <&vreg_l2c_e1_1p14>;
+ vdda-phy-supply = <&vreg_l3c1>;
+ vdda-pll-supply = <&vreg_l2c1>;
};
&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l1f_e1_0p82>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrpt5-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f_e1_0p83>;
- vdda-qrefrx3-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f_e1_0p82>;
- vdda-refgen3-0p9-supply = <&vreg_l1f_e1_0p82>;
- vdda-refgen3-1p2-supply = <&vreg_l4f_e1_1p08>;
+ vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt3-0p9-supply = <&vreg_l1f1>;
+ vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrpt5-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx3-0p9-supply = <&vreg_l2h0>;
+ vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen3-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen3-1p2-supply = <&vreg_l4f1>;
};
diff --git a/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts b/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts
index 26d6d8285e04..860e9ef01aa6 100644
--- a/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts
+++ b/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts
@@ -332,11 +332,11 @@ wcn7850-pmu {
compatible = "qcom,wcn7850-pmu";
vdd-supply = <&vreg_wcn_0p95>;
- vddio-supply = <&vreg_l15b_e0_1p8>;
- vddaon-supply = <&vreg_l15b_e0_1p8>;
- vdddig-supply = <&vreg_l15b_e0_1p8>;
- vddrfa1p2-supply = <&vreg_l15b_e0_1p8>;
- vddrfa1p8-supply = <&vreg_l15b_e0_1p8>;
+ vddio-supply = <&vreg_l15b0>;
+ vddaon-supply = <&vreg_l15b0>;
+ vdddig-supply = <&vreg_l15b0>;
+ vddrfa1p2-supply = <&vreg_l15b0>;
+ vddrfa1p8-supply = <&vreg_l15b0>;
wlan-enable-gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
bt-enable-gpios = <&tlmm 116 GPIO_ACTIVE_HIGH>;
@@ -407,79 +407,79 @@ vreg_bob2_e0: bob2 {
regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
};
- vreg_l1b_e0_1p8: ldo1 {
- regulator-name = "vreg_l1b_e0_1p8";
+ vreg_l1b0: ldo1 {
+ regulator-name = "vreg_l1b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2b_e0_2p9: ldo2 {
- regulator-name = "vreg_l2b_e0_2p9";
+ vreg_l2b0: ldo2 {
+ regulator-name = "vreg_l2b0";
regulator-min-microvolt = <2904000>;
regulator-max-microvolt = <2904000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l7b_e0_2p79: ldo7 {
- regulator-name = "vreg_l7b_e0_2p79";
+ vreg_l7b0: ldo7 {
+ regulator-name = "vreg_l7b0";
regulator-min-microvolt = <2790000>;
regulator-max-microvolt = <2792000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l8b_e0_3p3: ldo8 {
- regulator-name = "vreg_l8b_e0_3p3";
+ vreg_l8b0: ldo8 {
+ regulator-name = "vreg_l8b0";
regulator-min-microvolt = <1504000>;
regulator-max-microvolt = <3304000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l9b_e0_2p9: ldo9 {
- regulator-name = "vreg_l9b_e0_2p9";
+ vreg_l9b0: ldo9 {
+ regulator-name = "vreg_l9b0";
regulator-min-microvolt = <2704000>;
regulator-max-microvolt = <2960000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l10b_e0_1p8: ldo10 {
- regulator-name = "vreg_l10b_e0_1p8";
+ vreg_l10b0: ldo10 {
+ regulator-name = "vreg_l10b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l11b_e0_1p2: ldo11 {
- regulator-name = "vreg_l11b_e0_1p2";
+ vreg_l11b0: ldo11 {
+ regulator-name = "vreg_l11b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l12b_e0_1p2: ldo12 {
- regulator-name = "vreg_l12b_e0_1p2";
+ vreg_l12b0: ldo12 {
+ regulator-name = "vreg_l12b0";
regulator-min-microvolt = <1144000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l15b_e0_1p8: ldo15 {
- regulator-name = "vreg_l15b_e0_1p8";
+ vreg_l15b0: ldo15 {
+ regulator-name = "vreg_l15b0";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
regulator-always-on;
};
- vreg_l17b_e0_2p4: ldo17 {
- regulator-name = "vreg_l17b_e0_2p4";
+ vreg_l17b0: ldo17 {
+ regulator-name = "vreg_l17b0";
regulator-min-microvolt = <2400000>;
regulator-max-microvolt = <2700000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l18b_e0_1p2: ldo18 {
- regulator-name = "vreg_l18b_e0_1p2";
+ vreg_l18b0: ldo18 {
+ regulator-name = "vreg_l18b0";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -491,29 +491,29 @@ regulators-1 {
compatible = "qcom,pmcx0102-rpmh-regulators";
qcom,pmic-id = "C_E1";
- vreg_l1c_e1_0p82: ldo1 {
- regulator-name = "vreg_l1c_e1_0p82";
+ vreg_l1c1: ldo1 {
+ regulator-name = "vreg_l1c1";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2c_e1_1p14: ldo2 {
- regulator-name = "vreg_l2c_e1_1p14";
+ vreg_l2c1: ldo2 {
+ regulator-name = "vreg_l2c1";
regulator-min-microvolt = <1144000>;
regulator-max-microvolt = <1144000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3c_e1_0p89: ldo3 {
- regulator-name = "vreg_l3c_e1_0p89";
+ vreg_l3c1: ldo3 {
+ regulator-name = "vreg_l3c1";
regulator-min-microvolt = <890000>;
regulator-max-microvolt = <980000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4c_e1_0p72: ldo4 {
- regulator-name = "vreg_l4c_e1_0p72";
+ vreg_l4c1: ldo4 {
+ regulator-name = "vreg_l4c1";
regulator-min-microvolt = <720000>;
regulator-max-microvolt = <720000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -524,43 +524,43 @@ regulators-2 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E0";
- vreg_s7f_e0_1p32: smps7 {
- regulator-name = "vreg_s7f_e0_1p32";
+ vreg_s7f0: smps7 {
+ regulator-name = "vreg_s7f0";
regulator-min-microvolt = <1320000>;
regulator-max-microvolt = <1352000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_s8f_e0_0p95: smps8 {
- regulator-name = "vreg_s8f_e0_0p95";
+ vreg_s8f0: smps8 {
+ regulator-name = "vreg_s8f0";
regulator-min-microvolt = <952000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_s9f_e0_1p9: smps9 {
- regulator-name = "vreg_s9f_e0_1p9";
+ vreg_s9f0: smps9 {
+ regulator-name = "vreg_s9f0";
regulator-min-microvolt = <1900000>;
regulator-max-microvolt = <2000000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e0_0p94: ldo2 {
- regulator-name = "vreg_l2f_e0_0p94";
+ vreg_l2f0: ldo2 {
+ regulator-name = "vreg_l2f0";
regulator-min-microvolt = <936000>;
regulator-max-microvolt = <936000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3f_e0_0p91: ldo3 {
- regulator-name = "vreg_l3f_e0_0p91";
+ vreg_l3f0: ldo3 {
+ regulator-name = "vreg_l3f0";
regulator-min-microvolt = <912000>;
regulator-max-microvolt = <912000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4f_e0_0p3: ldo4 {
- regulator-name = "vreg_l4f_e0_0p3";
+ vreg_l4f0: ldo4 {
+ regulator-name = "vreg_l4f0";
regulator-min-microvolt = <1080000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -571,29 +571,29 @@ regulators-3 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "F_E1";
- vreg_s7f_e1_0p3: smps7 {
- regulator-name = "vreg_s7f_e1_0p3";
+ vreg_s7f1: smps7 {
+ regulator-name = "vreg_s7f1";
regulator-min-microvolt = <300000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l1f_e1_0p88: ldo1 {
- regulator-name = "vreg_l1f_e1_0p88";
+ vreg_l1f1: ldo1 {
+ regulator-name = "vreg_l1f1";
regulator-min-microvolt = <880000>;
regulator-max-microvolt = <880000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2f_e1_0p9: ldo2 {
- regulator-name = "vreg_l2f_e1_0p9";
+ vreg_l2f1: ldo2 {
+ regulator-name = "vreg_l2f1";
regulator-min-microvolt = <904000>;
regulator-max-microvolt = <904000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4f_e1_1p2: ldo4 {
- regulator-name = "vreg_l4f_e1_1p2";
+ vreg_l4f1: ldo4 {
+ regulator-name = "vreg_l4f1";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -604,29 +604,29 @@ regulators-4 {
compatible = "qcom,pmh0110-rpmh-regulators";
qcom,pmic-id = "H_E0";
- vreg_l1h_e0_0p94: ldo1 {
- regulator-name = "vreg_l1h_e0_0p94";
+ vreg_l1h0: ldo1 {
+ regulator-name = "vreg_l1h0";
regulator-min-microvolt = <936000>;
regulator-max-microvolt = <936000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l2h_e0_0p72: ldo2 {
- regulator-name = "vreg_l2h_e0_0p72";
+ vreg_l2h0: ldo2 {
+ regulator-name = "vreg_l2h0";
regulator-min-microvolt = <832000>;
regulator-max-microvolt = <832000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l3h_e0_0p32: ldo3 {
- regulator-name = "vreg_l3h_e0_0p32";
+ vreg_l3h0: ldo3 {
+ regulator-name = "vreg_l3h0";
regulator-min-microvolt = <320000>;
regulator-max-microvolt = <2000000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- vreg_l4h_e0_1p2: ldo4 {
- regulator-name = "vreg_l4h_e0_1p2";
+ vreg_l4h0: ldo4 {
+ regulator-name = "vreg_l4h0";
regulator-min-microvolt = <1080000>;
regulator-max-microvolt = <1320000>;
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -656,7 +656,7 @@ touchpad@2c {
interrupts-extended = <&tlmm 3 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
- vddl-supply = <&vreg_l15b_e0_1p8>;
+ vddl-supply = <&vreg_l15b0>;
pinctrl-0 = <&tpad_default>;
pinctrl-names = "default";
@@ -672,7 +672,7 @@ keyboard@3a {
interrupts-extended = <&tlmm 67 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
- vddl-supply = <&vreg_l15b_e0_1p8>;
+ vddl-supply = <&vreg_l15b0>;
pinctrl-0 = <&kybd_default>;
pinctrl-names = "default";
@@ -692,8 +692,8 @@ ptn3222_0: redriver@43 {
reset-gpios = <&tlmm 25 GPIO_ACTIVE_LOW>;
- vdd3v3-supply = <&vreg_l8b_e0_3p3>;
- vdd1v8-supply = <&vreg_l15b_e0_1p8>;
+ vdd3v3-supply = <&vreg_l8b0>;
+ vdd1v8-supply = <&vreg_l15b0>;
#phy-cells = <0>;
};
@@ -704,8 +704,8 @@ ptn3222_1: redriver@4b {
reset-gpios = <&tlmm 184 GPIO_ACTIVE_LOW>;
- vdd3v3-supply = <&vreg_l8b_e0_3p3>;
- vdd1v8-supply = <&vreg_l15b_e0_1p8>;
+ vdd3v3-supply = <&vreg_l8b0>;
+ vdd1v8-supply = <&vreg_l15b0>;
#phy-cells = <0>;
};
@@ -716,8 +716,8 @@ ptn3222_cam: redriver@47 {
reset-gpios = <&tlmm 184 GPIO_ACTIVE_LOW>;
- vdd3v3-supply = <&vreg_l8b_e0_3p3>;
- vdd1v8-supply = <&vreg_l15b_e0_1p8>;
+ vdd3v3-supply = <&vreg_l8b0>;
+ vdd1v8-supply = <&vreg_l15b0>;
#phy-cells = <0>;
};
@@ -728,8 +728,8 @@ ptn3222_fpr: redriver@4f {
reset-gpios = <&tlmm 40 GPIO_ACTIVE_LOW>;
- vdd3v3-supply = <&vreg_l8b_e0_3p3>;
- vdd1v8-supply = <&vreg_l15b_e0_1p8>;
+ vdd3v3-supply = <&vreg_l8b0>;
+ vdd1v8-supply = <&vreg_l15b0>;
#phy-cells = <0>;
};
@@ -739,7 +739,7 @@ &lpass_vamacro {
pinctrl-0 = <&dmic01_default>;
pinctrl-names = "default";
qcom,dmic-sample-rate = <4800000>;
- vdd-micb-supply = <&vreg_l1b_e0_1p8>;
+ vdd-micb-supply = <&vreg_l1b0>;
};
&mdss {
@@ -796,8 +796,8 @@ &mdss_dp3_out {
};
&mdss_dp3_phy {
- vdda-phy-supply = <&vreg_l2f_e1_0p9>;
- vdda-pll-supply = <&vreg_l4f_e1_1p2>;
+ vdda-phy-supply = <&vreg_l2f1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -811,8 +811,8 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c_e1_0p82>;
- vdda-pll-supply = <&vreg_l4f_e1_1p2>;
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -848,8 +848,8 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f_e0_0p94>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
+ vdda-phy-supply = <&vreg_l2f0>;
+ vdda-pll-supply = <&vreg_l4h0>;
status = "okay";
};
@@ -870,8 +870,8 @@ &pcie6 {
};
&pcie6_phy {
- vdda-phy-supply = <&vreg_l1c_e1_0p82>;
- vdda-pll-supply = <&vreg_l4f_e1_1p2>;
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -930,8 +930,8 @@ left_spkr: speaker@0,0 {
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "SpkrLeft";
- vdd-1p8-supply = <&vreg_l15b_e0_1p8>;
- vdd-io-supply = <&vreg_l18b_e0_1p2>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <1 2 3 7 12 14>;
};
@@ -942,42 +942,42 @@ right_spkr: speaker@0,1 {
reset-gpios = <&lpass_tlmm 12 GPIO_ACTIVE_LOW>;
#sound-dai-cells = <0>;
sound-name-prefix = "SpkrRight";
- vdd-1p8-supply = <&vreg_l15b_e0_1p8>;
- vdd-io-supply = <&vreg_l18b_e0_1p2>;
+ vdd-1p8-supply = <&vreg_l15b0>;
+ vdd-io-supply = <&vreg_l18b0>;
qcom,port-mapping = <4 5 6 7 13 15>;
};
};
&smb2370_j_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0_1p8>;
- vdd3-supply = <&vreg_l7b_e0_2p79>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
};
&smb2370_k_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b_e0_1p8>;
- vdd3-supply = <&vreg_l7b_e0_2p79>;
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
};
&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f_e1_0p9>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f_e1_0p9>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f_e1_0p9>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrpt5-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f_e1_0p9>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f_e1_0p9>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f_e1_0p9>;
- vdda-qrefrx3-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h_e0_0p72>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f_e0_0p91>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f_e0_0p91>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h_e0_1p2>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f_e1_0p88>;
- vdda-refgen3-0p9-supply = <&vreg_l2f_e0_0p94>;
- vdda-refgen3-1p2-supply = <&vreg_l4h_e0_1p2>;
- vdda-refgen4-0p9-supply = <&vreg_l1f_e1_0p88>;
- vdda-refgen4-1p2-supply = <&vreg_l4f_e1_1p2>;
+ vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrpt5-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx3-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
+ vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen3-0p9-supply = <&vreg_l2f0>;
+ vdda-refgen3-1p2-supply = <&vreg_l4h0>;
+ vdda-refgen4-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen4-1p2-supply = <&vreg_l4f1>;
};
&tlmm {
@@ -1149,8 +1149,8 @@ &usb_0_dwc3_hs {
};
&usb_0_hsphy {
- vdd-supply = <&vreg_l3f_e0_0p91>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&smb2370_j_e2_eusb2_repeater>;
@@ -1158,9 +1158,9 @@ &usb_0_hsphy {
};
&usb_0_qmpphy {
- vdda-phy-supply = <&vreg_l3f_e0_0p91>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l2f_e0_0p94>;
+ vdda-phy-supply = <&vreg_l3f0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l2f0>;
status = "okay";
};
@@ -1178,8 +1178,8 @@ &usb_1_dwc3_hs {
};
&usb_1_hsphy {
- vdd-supply = <&vreg_l3f_e0_0p91>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&smb2370_k_e2_eusb2_repeater>;
@@ -1187,9 +1187,9 @@ &usb_1_hsphy {
};
&usb_1_qmpphy {
- vdda-phy-supply = <&vreg_l1h_e0_0p94>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l2f_e0_0p94>;
+ vdda-phy-supply = <&vreg_l1h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l2f0>;
status = "okay";
};
@@ -1203,8 +1203,8 @@ &usb_mp {
};
&usb_mp_hsphy0 {
- vdd-supply = <&vreg_l2h_e0_0p72>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&ptn3222_0>;
@@ -1212,8 +1212,8 @@ &usb_mp_hsphy0 {
};
&usb_mp_hsphy1 {
- vdd-supply = <&vreg_l2h_e0_0p72>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&ptn3222_1>;
//USB-A..
@@ -1221,17 +1221,17 @@ &usb_mp_hsphy1 {
};
&usb_mp_qmpphy0 {
- vdda-phy-supply = <&vreg_l2h_e0_0p72>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l4f_e1_1p2>;
+ vdda-phy-supply = <&vreg_l2h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l4f1>;
status = "okay";
};
&usb_mp_qmpphy1 {
- vdda-phy-supply = <&vreg_l2h_e0_0p72>;
- vdda-pll-supply = <&vreg_l4h_e0_1p2>;
- refgen-supply = <&vreg_l4f_e1_1p2>;
+ vdda-phy-supply = <&vreg_l2h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l4f1>;
status = "okay";
};
@@ -1243,8 +1243,8 @@ &usb_hs {
};
&usb_hs_phy {
- vdd-supply = <&vreg_l2h_e0_0p72>;
- vdda12-supply = <&vreg_l4h_e0_1p2>;
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
phys = <&ptn3222_cam>;
@@ -1263,8 +1263,8 @@ &usb_2 {
};
&usb_2_hsphy {
- vdd-supply = <&vreg_l4c_e1_0p72>;
- vdda12-supply = <&vreg_l4f_e1_1p2>;
+ vdd-supply = <&vreg_l4c1>;
+ vdda12-supply = <&vreg_l4f1>;
phys = <&ptn3222_fpr>;
--
2.56.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] arm64: dts: qcom: Consolidate Glymur CoB power grid
2026-10-28 20:04 [PATCH 0/3] Commonize Glymur regulator settings for fixed rails Konrad Dybcio
2026-10-28 20:04 ` [PATCH 1/3] arm64: dts: qcom: Unify Glymur/Mahua regulator handles Konrad Dybcio
@ 2026-10-28 20:04 ` Konrad Dybcio
2026-10-28 20:17 ` sashiko-bot
2026-10-28 20:04 ` [PATCH 3/3] arm64: dts: qcom: glymur-crd: Drop L4F0 Konrad Dybcio
2 siblings, 1 reply; 5+ messages in thread
From: Konrad Dybcio @ 2026-10-28 20:04 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Dmitry Baryshkov,
Gopikrishna Garmidi
Cc: linux-arm-msm, devicetree, linux-kernel, Konrad Dybcio
From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
The power grid is partly defined by connections to the on-SoC
peripherals, which (due to various reasons, electrical and practical)
are well-defined for each PMIC configuration. Factor out the common
bits for Glymur CoB devices.
Because some DTs (mostly the CRD) disagreed about certain values, I
made sure to look up the desired one for each of these common rails,
they are now set as expected.
This enables one to take care of most required vreg settings with a
single #include.
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
.../dts/qcom/glymur-asus-zenbook-a14-ux3407na.dts | 235 +------------
arch/arm64/boot/dts/qcom/glymur-cob.dtsi | 310 +++++++++++++++++
arch/arm64/boot/dts/qcom/glymur-crd.dts | 21 +-
arch/arm64/boot/dts/qcom/glymur-crd.dtsi | 358 ++++----------------
.../boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts | 198 +----------
.../boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts | 283 ++--------------
arch/arm64/boot/dts/qcom/glymur-qcb.dts | 320 ++++--------------
arch/arm64/boot/dts/qcom/mahua-crd.dts | 15 +-
.../qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts | 366 +++------------------
arch/arm64/boot/dts/qcom/mahua.dtsi | 2 +-
10 files changed, 534 insertions(+), 1574 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/glymur-asus-zenbook-a14-ux3407na.dts b/arch/arm64/boot/dts/qcom/glymur-asus-zenbook-a14-ux3407na.dts
index e96e65a0c5b4..dcbc88a2108f 100644
--- a/arch/arm64/boot/dts/qcom/glymur-asus-zenbook-a14-ux3407na.dts
+++ b/arch/arm64/boot/dts/qcom/glymur-asus-zenbook-a14-ux3407na.dts
@@ -5,13 +5,7 @@
/dts-v1/;
#include "glymur.dtsi"
-
-#include "pmcx0102.dtsi"
-#include "pmh0101.dtsi"
-#include "pmh0110-glymur.dtsi"
-#include "pmh0104-glymur.dtsi"
-#include "pmk8850.dtsi"
-#include "smb2370.dtsi"
+#include "glymur-cob.dtsi"
#include <dt-bindings/input/gpio-keys.h>
#include <dt-bindings/input/input.h>
@@ -355,157 +349,12 @@ m2_e_uart_ep: endpoint@0 {
};
};
-&apps_rsc {
- regulators-0 {
- compatible = "qcom,pmh0101-rpmh-regulators";
- qcom,pmic-id = "B_E0";
-
- vreg_l1b0: ldo1 {
- regulator-name = "vreg_l1b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l7b0: ldo7 {
- regulator-name = "vreg_l7b0";
- regulator-min-microvolt = <3072000>;
- regulator-max-microvolt = <3072000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l8b0: ldo8 {
- regulator-name = "vreg_l8b0";
- regulator-min-microvolt = <3304000>;
- regulator-max-microvolt = <3304000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l15b0: ldo15 {
- regulator-name = "vreg_l15b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- /* Provides reference voltage for many undescribed components */
- regulator-always-on;
- };
-
- vreg_l18b0: ldo18 {
- regulator-name = "vreg_l18b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
-
- /*
- * This is also reference voltage for &pcie3b wake and
- * reset signals.
- */
- regulator-always-on;
- };
- };
-
- regulators-1 {
- compatible = "qcom,pmcx0102-rpmh-regulators";
- qcom,pmic-id = "C_E1";
-
- vreg_l1c1: ldo1 {
- regulator-name = "vreg_l1c1";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2c1: ldo2 {
- regulator-name = "vreg_l2c1";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3c1: ldo3 {
- regulator-name = "vreg_l3c1";
- regulator-min-microvolt = <936000>;
- regulator-max-microvolt = <936000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4c1: ldo4 {
- regulator-name = "vreg_l4c1";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
- };
-
- regulators-2 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E0";
-
- vreg_l2f0: ldo2 {
- regulator-name = "vreg_l2f0";
- regulator-min-microvolt = <936000>;
- regulator-max-microvolt = <936000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3f0: ldo3 {
- regulator-name = "vreg_l3f0";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
- };
-
- regulators-3 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E1";
-
- vreg_l1f1: ldo1 {
- regulator-name = "vreg_l1f1";
- regulator-min-microvolt = <904000>;
- regulator-max-microvolt = <904000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2f1: ldo2 {
- regulator-name = "vreg_l2f1";
- regulator-min-microvolt = <880000>;
- regulator-max-microvolt = <880000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4f1: ldo4 {
- regulator-name = "vreg_l4f1";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
- };
-
- regulators-4 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "H_E0";
-
- vreg_l1h0: ldo1 {
- regulator-name = "vreg_l1h0";
- regulator-min-microvolt = <936000>;
- regulator-max-microvolt = <936000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2h0: ldo2 {
- regulator-name = "vreg_l2h0";
- regulator-min-microvolt = <880000>;
- regulator-max-microvolt = <880000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4h0: ldo4 {
- regulator-name = "vreg_l4h0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+&rpmh_vregs_b_e0 {
+ vreg_l8b0: ldo8 {
+ regulator-name = "vreg_l8b0";
+ regulator-min-microvolt = <3304000>;
+ regulator-max-microvolt = <3304000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
};
@@ -625,8 +474,6 @@ keyboard@15 {
};
&lpass_vamacro {
- vdd-micb-supply = <&vreg_l1b0>;
-
pinctrl-0 = <&dmic01_default>;
pinctrl-names = "default";
@@ -695,9 +542,6 @@ &mdss_dp3_out {
};
&mdss_dp3_phy {
- vdda-phy-supply = <&vreg_l2f1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -733,9 +577,6 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -791,16 +632,6 @@ &remoteproc_soccp {
status = "okay";
};
-&smb2370_j_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-};
-
-&smb2370_k_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-};
-
&swr0 {
status = "okay";
@@ -829,26 +660,6 @@ right_speaker: speaker@0,1 {
};
};
-&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
- vdda-refgen3-0p9-supply = <&vreg_l2f0>;
- vdda-refgen3-1p2-supply = <&vreg_l4h0>;
- vdda-refgen4-0p9-supply = <&vreg_l1f1>;
- vdda-refgen4-1p2-supply = <&vreg_l4f1>;
-};
-
&tlmm {
gpio-reserved-ranges = <4 4>, /* EC Secure */
<10 2>, /* OOB UART */
@@ -1025,19 +836,12 @@ &usb_0_dwc3_hs {
};
&usb_0_hsphy {
- vdd-supply = <&vreg_l3f0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&smb2370_j_e2_eusb2_repeater>;
status = "okay";
};
&usb_0_qmpphy {
- vdda-phy-supply = <&vreg_l3f0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l2f0>;
-
status = "okay";
};
@@ -1054,19 +858,12 @@ &usb_1_dwc3_hs {
};
&usb_1_hsphy {
- vdd-supply = <&vreg_l3f0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&smb2370_k_e2_eusb2_repeater>;
status = "okay";
};
&usb_1_qmpphy {
- vdda-phy-supply = <&vreg_l1h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l2f0>;
-
status = "okay";
};
@@ -1075,10 +872,6 @@ &usb_1_qmpphy_out {
};
&usb_2_qmpphy {
- vdda-phy-supply = <&vreg_l4c1>;
- vdda-pll-supply = <&vreg_l4f1>;
- refgen-supply = <&vreg_l4f1>;
-
/delete-property/ mode-switch;
/delete-property/ orientation-switch;
@@ -1106,35 +899,21 @@ &usb_mp {
};
&usb_mp_hsphy0 {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&ptn3222_0>;
status = "okay";
};
&usb_mp_hsphy1 {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&ptn3222_1>;
status = "okay";
};
&usb_mp_qmpphy0 {
- vdda-phy-supply = <&vreg_l2h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l4f1>;
-
status = "okay";
};
&usb_mp_qmpphy1 {
- vdda-phy-supply = <&vreg_l2h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l4f1>;
-
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/glymur-cob.dtsi b/arch/arm64/boot/dts/qcom/glymur-cob.dtsi
new file mode 100644
index 000000000000..8b4ba1d384a0
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/glymur-cob.dtsi
@@ -0,0 +1,310 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ *
+ * Common PMIC settings for on-SoC peripherals found on Glymur-CoB and
+ * derived platforms.
+ */
+
+#include "pmcx0102.dtsi" /* SPMI0: SID-2/3 SPMI1: SID-2/3 */
+#include "pmh0101.dtsi" /* SPMI0: SID-1 */
+#include "pmh0110-glymur.dtsi" /* SPMI0: SID-5/7 SPMI1: SID-5 */
+#include "pmh0104-glymur.dtsi" /* SPMI0: SID-8/9 SPMI1: SID-11 */
+#include "pmk8850.dtsi" /* SPMI0: SID-0 */
+#include "smb2370.dtsi" /* SPMI2: SID-9/10/11 */
+
+&apps_rsc {
+ rpmh_vregs_b_e0: regulators-0 {
+ compatible = "qcom,pmh0101-rpmh-regulators";
+ qcom,pmic-id = "B_E0";
+
+ vreg_l1b0: ldo1 {
+ regulator-name = "vreg_l1b0";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ vreg_l7b0: ldo7 {
+ regulator-name = "vreg_l7b0";
+ regulator-min-microvolt = <3100000>;
+ regulator-max-microvolt = <3100000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ /* Pull-ups etc. */
+ vreg_l10b0: ldo10 {
+ regulator-name = "vreg_l10b0";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ /* Pull-ups etc. */
+ vreg_l11b0: ldo11 {
+ regulator-name = "vreg_l11b0";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ /* Pull-ups etc. */
+ vreg_l15b0: ldo15 {
+ regulator-name = "vreg_l15b0";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ /* Provides reference voltage for many undescribed components */
+ regulator-always-on;
+ };
+
+ /* Pull-ups etc. */
+ vreg_l18b0: ldo18 {
+ regulator-name = "vreg_l18b0";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ /* Provides reference voltage for many undescribed components */
+ regulator-always-on;
+ };
+ };
+
+ rpmh_vregs_c_e1: regulators-1 {
+ compatible = "qcom,pmcx0102-rpmh-regulators";
+ qcom,pmic-id = "C_E1";
+
+ vreg_l1c1: ldo1 {
+ regulator-name = "vreg_l1c1";
+ regulator-min-microvolt = <912000>;
+ regulator-max-microvolt = <912000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ vreg_l2c1: ldo2 {
+ regulator-name = "vreg_l2c1";
+ regulator-min-microvolt = <1216000>;
+ regulator-max-microvolt = <1216000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ vreg_l3c1: ldo3 {
+ regulator-name = "vreg_l3c1";
+ regulator-min-microvolt = <952000>;
+ regulator-max-microvolt = <952000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ vreg_l4c1: ldo4 {
+ regulator-name = "vreg_l4c1";
+ regulator-min-microvolt = <912000>;
+ regulator-max-microvolt = <912000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+ };
+
+ rpmh_vregs_f_e0: regulators-2 {
+ compatible = "qcom,pmh0110-rpmh-regulators";
+ qcom,pmic-id = "F_E0";
+
+ vreg_l2f0: ldo2 {
+ regulator-name = "vreg_l2f0";
+ regulator-min-microvolt = <944000>;
+ regulator-max-microvolt = <944000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ vreg_l3f0: ldo3 {
+ regulator-name = "vreg_l3f0";
+ regulator-min-microvolt = <912000>;
+ regulator-max-microvolt = <912000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ /* Voltage input for PMCX0104 */
+ vreg_s9f0: smps9 {
+ regulator-name = "vreg_s9f0";
+ regulator-min-microvolt = <1900000>;
+ regulator-max-microvolt = <1900000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+ };
+
+ rpmh_vregs_f_e1: regulators-3 {
+ compatible = "qcom,pmh0110-rpmh-regulators";
+ qcom,pmic-id = "F_E1";
+
+ vreg_l1f1: ldo1 {
+ regulator-name = "vreg_l1f1";
+ regulator-min-microvolt = <904000>;
+ regulator-max-microvolt = <904000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ vreg_l2f1: ldo2 {
+ regulator-name = "vreg_l2f1";
+ regulator-min-microvolt = <880000>;
+ regulator-max-microvolt = <880000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ vreg_l4f1: ldo4 {
+ regulator-name = "vreg_l4f1";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+ };
+
+ rpmh_vregs_h_e0: regulators-4 {
+ compatible = "qcom,pmh0110-rpmh-regulators";
+ qcom,pmic-id = "H_E0";
+
+ vreg_l1h0: ldo1 {
+ regulator-name = "vreg_l1h0";
+ regulator-min-microvolt = <936000>;
+ regulator-max-microvolt = <936000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ vreg_l2h0: ldo2 {
+ regulator-name = "vreg_l2h0";
+ regulator-min-microvolt = <880000>;
+ regulator-max-microvolt = <880000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ /* DDR, QFPROM */
+ vreg_l3h0: ldo3 {
+ regulator-name = "vreg_l3h0";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ vreg_l4h0: ldo4 {
+ regulator-name = "vreg_l4h0";
+ regulator-min-microvolt = <1216000>;
+ regulator-max-microvolt = <1216000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+ };
+};
+
+&lpass_vamacro {
+ vdd-micb-supply = <&vreg_l1b0>;
+};
+
+&mdss_dp3_phy {
+ vdda-phy-supply = <&vreg_l2f1>;
+ vdda-pll-supply = <&vreg_l4f1>;
+};
+
+&pcie4_phy {
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
+};
+
+&pcie5_phy {
+ vdda-phy-supply = <&vreg_l2f0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+};
+
+&pcie6_phy {
+ vdda-phy-supply = <&vreg_l1c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
+};
+
+&smb2370_j_e2_eusb2_repeater {
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
+};
+
+&smb2370_k_e2_eusb2_repeater {
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
+};
+
+&smb2370_l_e2_eusb2_repeater {
+ vdd18-supply = <&vreg_l15b0>;
+ vdd3-supply = <&vreg_l7b0>;
+};
+
+&tcsr {
+ vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
+ vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
+ vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
+ vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
+ vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen3-0p9-supply = <&vreg_l2f0>;
+ vdda-refgen3-1p2-supply = <&vreg_l4h0>;
+ vdda-refgen4-0p9-supply = <&vreg_l1f1>;
+ vdda-refgen4-1p2-supply = <&vreg_l4f1>;
+};
+
+&usb_0_hsphy {
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4h0>;
+};
+
+&usb_0_qmpphy {
+ vdda-phy-supply = <&vreg_l3f0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l2f0>;
+};
+
+&usb_1_hsphy {
+ vdd-supply = <&vreg_l3f0>;
+ vdda12-supply = <&vreg_l4h0>;
+};
+
+&usb_1_qmpphy {
+ vdda-phy-supply = <&vreg_l1h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l2f0>;
+};
+
+&usb_2_hsphy {
+ vdd-supply = <&vreg_l4c1>;
+ vdda12-supply = <&vreg_l4f1>;
+};
+
+&usb_2_qmpphy {
+ vdda-phy-supply = <&vreg_l4c1>;
+ vdda-pll-supply = <&vreg_l4f1>;
+ refgen-supply = <&vreg_l4f1>;
+};
+
+&usb_hs_phy {
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
+};
+
+&usb_mp_hsphy0 {
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
+};
+
+&usb_mp_hsphy1 {
+ vdd-supply = <&vreg_l2h0>;
+ vdda12-supply = <&vreg_l4h0>;
+};
+
+&usb_mp_qmpphy0 {
+ vdda-phy-supply = <&vreg_l2h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l4f1>;
+};
+
+&usb_mp_qmpphy1 {
+ vdda-phy-supply = <&vreg_l2h0>;
+ vdda-pll-supply = <&vreg_l4h0>;
+ refgen-supply = <&vreg_l4f1>;
+};
diff --git a/arch/arm64/boot/dts/qcom/glymur-crd.dts b/arch/arm64/boot/dts/qcom/glymur-crd.dts
index dfac99056bcd..7afb15074190 100644
--- a/arch/arm64/boot/dts/qcom/glymur-crd.dts
+++ b/arch/arm64/boot/dts/qcom/glymur-crd.dts
@@ -6,6 +6,7 @@
/dts-v1/;
#include "glymur.dtsi"
+#include "glymur-cob.dtsi"
#include "glymur-crd.dtsi"
/ {
@@ -36,23 +37,3 @@ &pcie3_phy {
vdda-refgen0p9-supply = <&vreg_l1c1>;
vdda-refgen1p2-supply = <&vreg_l4f1>;
};
-
-&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
- vdda-refgen3-0p9-supply = <&vreg_l2f0>;
- vdda-refgen3-1p2-supply = <&vreg_l4h0>;
- vdda-refgen4-0p9-supply = <&vreg_l1f1>;
- vdda-refgen4-1p2-supply = <&vreg_l4f1>;
-};
diff --git a/arch/arm64/boot/dts/qcom/glymur-crd.dtsi b/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
index 4744bcb3c123..422ed0308147 100644
--- a/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
+++ b/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
@@ -3,13 +3,6 @@
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
*/
-#include "pmcx0102.dtsi" /* SPMI0: SID-2/3 SPMI1: SID-2/3 */
-#include "pmh0101.dtsi" /* SPMI0: SID-1 */
-#include "pmh0110-glymur.dtsi" /* SPMI0: SID-5/7 SPMI1: SID-5 */
-#include "pmh0104-glymur.dtsi" /* SPMI0: SID-8/9 SPMI1: SID-11 */
-#include "pmk8850.dtsi" /* SPMI0: SID-0 */
-#include "smb2370.dtsi" /* SPMI2: SID-9/10/11 */
-
#include <dt-bindings/input/gpio-keys.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
@@ -345,247 +338,86 @@ vreg_pmu_pcie_1p8: ldo9 {
};
};
-&apps_rsc {
- regulators-0 {
- compatible = "qcom,pmh0101-rpmh-regulators";
- qcom,pmic-id = "B_E0";
-
- vreg_bob1_e0: bob1 {
- regulator-name = "vreg_bob1_e0";
- regulator-min-microvolt = <2200000>;
- regulator-max-microvolt = <4224000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
- };
-
- vreg_bob2_e0: bob2 {
- regulator-name = "vreg_bob2_e0";
- regulator-min-microvolt = <2540000>;
- regulator-max-microvolt = <3600000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
- };
-
- vreg_l1b0: ldo1 {
- regulator-name = "vreg_l1b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2b0: ldo2 {
- regulator-name = "vreg_l2b0";
- regulator-min-microvolt = <1804000>;
- regulator-max-microvolt = <2904000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l7b0: ldo7 {
- regulator-name = "vreg_l7b0";
- regulator-min-microvolt = <2790000>;
- regulator-max-microvolt = <2792000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l8b0: ldo8 {
- regulator-name = "vreg_l8b0";
- regulator-min-microvolt = <1504000>;
- regulator-max-microvolt = <1504000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l9b0: ldo9 {
- regulator-name = "vreg_l9b0";
- regulator-min-microvolt = <2960000>;
- regulator-max-microvolt = <2960000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l10b0: ldo10 {
- regulator-name = "vreg_l10b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l11b0: ldo11 {
- regulator-name = "vreg_l11b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l12b0: ldo12 {
- regulator-name = "vreg_l12b0";
- regulator-min-microvolt = <1144000>;
- regulator-max-microvolt = <1144000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l15b0: ldo15 {
- regulator-name = "vreg_l15b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l17b0: ldo17 {
- regulator-name = "vreg_l17b0";
- regulator-min-microvolt = <2400000>;
- regulator-max-microvolt = <2700000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l18b0: ldo18 {
- regulator-name = "vreg_l18b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+&rpmh_vregs_b_e0 {
+ vreg_bob1_e0: bob1 {
+ regulator-name = "vreg_bob1_e0";
+ regulator-min-microvolt = <2200000>;
+ regulator-max-microvolt = <4224000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
};
- regulators-1 {
- compatible = "qcom,pmcx0102-rpmh-regulators";
- qcom,pmic-id = "C_E1";
-
- vreg_l1c1: ldo1 {
- regulator-name = "vreg_l1c1";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2c1: ldo2 {
- regulator-name = "vreg_l2c1";
- regulator-min-microvolt = <1144000>;
- regulator-max-microvolt = <1144000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3c1: ldo3 {
- regulator-name = "vreg_l3c1";
- regulator-min-microvolt = <890000>;
- regulator-max-microvolt = <980000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4c1: ldo4 {
- regulator-name = "vreg_l4c1";
- regulator-min-microvolt = <720000>;
- regulator-max-microvolt = <720000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_bob2_e0: bob2 {
+ regulator-name = "vreg_bob2_e0";
+ regulator-min-microvolt = <2540000>;
+ regulator-max-microvolt = <3600000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
};
- regulators-2 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E0";
-
- vreg_s7f0: smps7 {
- regulator-name = "vreg_s7f0";
- regulator-min-microvolt = <1320000>;
- regulator-max-microvolt = <1352000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_s8f0: smps8 {
- regulator-name = "vreg_s8f0";
- regulator-min-microvolt = <952000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_s9f0: smps9 {
- regulator-name = "vreg_s9f0";
- regulator-min-microvolt = <1900000>;
- regulator-max-microvolt = <2000000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2f0: ldo2 {
- regulator-name = "vreg_l2f0";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3f0: ldo3 {
- regulator-name = "vreg_l3f0";
- regulator-min-microvolt = <720000>;
- regulator-max-microvolt = <720000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4f0: ldo4 {
- regulator-name = "vreg_l4f0";
- regulator-min-microvolt = <1080000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_l2b0: ldo2 {
+ regulator-name = "vreg_l2b0";
+ regulator-min-microvolt = <1804000>;
+ regulator-max-microvolt = <2904000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- regulators-3 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E1";
-
- vreg_s7f1: smps7 {
- regulator-name = "vreg_s7f1";
- regulator-min-microvolt = <300000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l1f1: ldo1 {
- regulator-name = "vreg_l1f1";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2f1: ldo2 {
- regulator-name = "vreg_l2f1";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4f1: ldo4 {
- regulator-name = "vreg_l4f1";
- regulator-min-microvolt = <1080000>;
- regulator-max-microvolt = <1320000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_l8b0: ldo8 {
+ regulator-name = "vreg_l8b0";
+ regulator-min-microvolt = <1504000>;
+ regulator-max-microvolt = <1504000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- regulators-4 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "H_E0";
+ vreg_l9b0: ldo9 {
+ regulator-name = "vreg_l9b0";
+ regulator-min-microvolt = <2960000>;
+ regulator-max-microvolt = <2960000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
- vreg_l1h0: ldo1 {
- regulator-name = "vreg_l1h0";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_l12b0: ldo12 {
+ regulator-name = "vreg_l12b0";
+ regulator-min-microvolt = <1144000>;
+ regulator-max-microvolt = <1144000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
- vreg_l2h0: ldo2 {
- regulator-name = "vreg_l2h0";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_l17b0: ldo17 {
+ regulator-name = "vreg_l17b0";
+ regulator-min-microvolt = <2400000>;
+ regulator-max-microvolt = <2700000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+};
- vreg_l3h0: ldo3 {
- regulator-name = "vreg_l3h0";
- regulator-min-microvolt = <320000>;
- regulator-max-microvolt = <2000000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+&rpmh_vregs_f_e0 {
+ vreg_l4f0: ldo4 {
+ regulator-name = "vreg_l4f0";
+ regulator-min-microvolt = <1080000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
- vreg_l4h0: ldo4 {
- regulator-name = "vreg_l4h0";
- regulator-min-microvolt = <1080000>;
- regulator-max-microvolt = <1320000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_s7f0: smps7 {
+ regulator-name = "vreg_s7f0";
+ regulator-min-microvolt = <1320000>;
+ regulator-max-microvolt = <1352000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+
+ vreg_s8f0: smps8 {
+ regulator-name = "vreg_s8f0";
+ regulator-min-microvolt = <952000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+};
+
+&rpmh_vregs_f_e1 {
+ vreg_s7f1: smps7 {
+ regulator-name = "vreg_s7f1";
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
};
@@ -698,7 +530,6 @@ &lpass_vamacro {
pinctrl-0 = <&dmic01_default>, <&dmic23_default>;
pinctrl-names = "default";
qcom,dmic-sample-rate = <4800000>;
- vdd-micb-supply = <&vreg_l1b0>;
};
&mdss {
@@ -736,9 +567,6 @@ &mdss_dp3_out {
};
&mdss_dp3_phy {
- vdda-phy-supply = <&vreg_l2f1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -762,9 +590,6 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -798,9 +623,6 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f0>;
- vdda-pll-supply = <&vreg_l4h0>;
-
status = "okay";
};
@@ -819,9 +641,6 @@ &pcie6 {
};
&pcie6_phy {
- vdda-phy-supply = <&vreg_l1c1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -889,16 +708,6 @@ &remoteproc_cdsp {
status = "okay";
};
-&smb2370_j_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-};
-
-&smb2370_k_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-};
-
&sdhc_2 {
vmmc-supply = <&vreg_l9b0>;
vqmmc-supply = <&vreg_l2b0>;
@@ -1182,19 +991,12 @@ &usb_0_dwc3_hs {
};
&usb_0_hsphy {
- vdd-supply = <&vreg_l3f0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&smb2370_j_e2_eusb2_repeater>;
status = "okay";
};
&usb_0_qmpphy {
- vdda-phy-supply = <&vreg_l3f0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l2f0>;
-
status = "okay";
};
@@ -1211,19 +1013,12 @@ &usb_1_dwc3_hs {
};
&usb_1_hsphy {
- vdd-supply = <&vreg_l3f0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&smb2370_k_e2_eusb2_repeater>;
status = "okay";
};
&usb_1_qmpphy {
- vdda-phy-supply = <&vreg_l1h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l2f0>;
-
status = "okay";
};
@@ -1238,9 +1033,6 @@ &usb_hs {
};
&usb_hs_phy {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&ptn3222_1>;
status = "okay";
@@ -1251,33 +1043,19 @@ &usb_mp {
};
&usb_mp_hsphy0 {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&ptn3222_0>;
status = "okay";
};
&usb_mp_hsphy1 {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
status = "okay";
};
&usb_mp_qmpphy0 {
- vdda-phy-supply = <&vreg_l2h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l4f1>;
-
status = "okay";
};
&usb_mp_qmpphy1 {
- vdda-phy-supply = <&vreg_l2h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l4f1>;
-
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts b/arch/arm64/boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts
index ef77e70c8af3..d0a98a7ed02a 100644
--- a/arch/arm64/boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts
+++ b/arch/arm64/boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts
@@ -5,13 +5,7 @@
/dts-v1/;
#include "glymur.dtsi"
-
-#include "pmcx0102.dtsi"
-#include "pmh0101.dtsi"
-#include "pmh0110-glymur.dtsi"
-#include "pmh0104-glymur.dtsi"
-#include "pmk8850.dtsi"
-#include "smb2370.dtsi"
+#include "glymur-cob.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/gpio-keys.h>
@@ -292,124 +286,6 @@ vreg_pmu_pcie_1p8: ldo9 {
};
};
-&apps_rsc {
- regulators-0 {
- compatible = "qcom,pmh0101-rpmh-regulators";
- qcom,pmic-id = "B_E0";
-
- vreg_l1b0: ldo1 {
- regulator-name = "vreg_l1b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l7b0: ldo7 {
- regulator-name = "vreg_l7b0";
- regulator-min-microvolt = <3072000>;
- regulator-max-microvolt = <3072000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l15b0: ldo15 {
- regulator-name = "vreg_l15b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l18b0: ldo18 {
- regulator-name = "vreg_l18b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
- };
-
- regulators-1 {
- compatible = "qcom,pmcx0102-rpmh-regulators";
- qcom,pmic-id = "C_E1";
-
- vreg_l1c1: ldo1 {
- regulator-name = "vreg_l1c1";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
- };
-
- regulators-2 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E0";
-
- vreg_l2f0: ldo2 {
- regulator-name = "vreg_l2f0";
- regulator-min-microvolt = <936000>;
- regulator-max-microvolt = <936000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3f0: ldo3 {
- regulator-name = "vreg_l3f0";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
- };
-
- regulators-3 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E1";
-
- vreg_l1f1: ldo1 {
- regulator-name = "vreg_l1f1";
- regulator-min-microvolt = <880000>;
- regulator-max-microvolt = <880000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2f1: ldo2 {
- regulator-name = "vreg_l2f1";
- regulator-min-microvolt = <880000>;
- regulator-max-microvolt = <880000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4f1: ldo4 {
- regulator-name = "vreg_l4f1";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
- };
-
- regulators-4 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "H_E0";
-
- vreg_l1h0: ldo1 {
- regulator-name = "vreg_l1h0";
- regulator-min-microvolt = <936000>;
- regulator-max-microvolt = <936000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2h0: ldo2 {
- regulator-name = "vreg_l2h0";
- regulator-min-microvolt = <880000>;
- regulator-max-microvolt = <880000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4h0: ldo4 {
- regulator-name = "vreg_l4h0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
- };
-};
-
&gmu {
status = "okay";
};
@@ -470,8 +346,6 @@ touchscreen@10 {
};
&lpass_vamacro {
- vdd-micb-supply = <&vreg_l1b0>;
-
pinctrl-0 = <&dmic01_default>;
pinctrl-names = "default";
@@ -529,9 +403,6 @@ &mdss_dp3_out {
};
&mdss_dp3_phy {
- vdda-phy-supply = <&vreg_l2f1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -543,9 +414,6 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -579,9 +447,6 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f0>;
- vdda-pll-supply = <&vreg_l4h0>;
-
status = "okay";
};
@@ -624,16 +489,6 @@ &remoteproc_soccp {
"qcom/glymur/hp/elitebook-x-g2q/soccp_dtb.mbn";
};
-&smb2370_j_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-};
-
-&smb2370_k_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-};
-
&swr0 {
status = "okay";
@@ -690,26 +545,6 @@ right_tweeter: speaker@0,1 {
};
};
-&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
- vdda-refgen3-0p9-supply = <&vreg_l2f0>;
- vdda-refgen3-1p2-supply = <&vreg_l4h0>;
- vdda-refgen4-0p9-supply = <&vreg_l1f1>;
- vdda-refgen4-1p2-supply = <&vreg_l4f1>;
-};
-
&tlmm {
gpio-reserved-ranges = <4 4>, /* EC TZ Secure I3C */
<10 2>, /* OOB UART */
@@ -841,19 +676,12 @@ &usb_0_dwc3_hs {
};
&usb_0_hsphy {
- vdd-supply = <&vreg_l3f0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&smb2370_j_e2_eusb2_repeater>;
status = "okay";
};
&usb_0_qmpphy {
- vdda-phy-supply = <&vreg_l3f0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l2f0>;
-
status = "okay";
};
@@ -870,19 +698,12 @@ &usb_1_dwc3_hs {
};
&usb_1_hsphy {
- vdd-supply = <&vreg_l3f0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&smb2370_k_e2_eusb2_repeater>;
status = "okay";
};
&usb_1_qmpphy {
- vdda-phy-supply = <&vreg_l1h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l2f0>;
-
status = "okay";
};
@@ -898,9 +719,6 @@ &usb_hs {
};
&usb_hs_phy {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
status = "okay";
};
@@ -910,31 +728,17 @@ &usb_mp {
};
&usb_mp_hsphy0 {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
status = "okay";
};
&usb_mp_hsphy1 {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
status = "okay";
};
&usb_mp_qmpphy0 {
- vdda-phy-supply = <&vreg_l2h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l4f1>;
-
status = "okay";
};
&usb_mp_qmpphy1 {
- vdda-phy-supply = <&vreg_l2h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l4f1>;
-
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts
index 56c22daab056..a8580499e709 100644
--- a/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts
+++ b/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts
@@ -5,13 +5,7 @@
/dts-v1/;
#include "glymur.dtsi"
-
-#include "pmcx0102.dtsi" /* SPMI0: SID-2/3 SPMI1: SID-2/3 */
-#include "pmh0101.dtsi" /* SPMI0: SID-1 */
-#include "pmh0110-glymur.dtsi" /* SPMI0: SID-5/7 SPMI1: SID-5 */
-#include "pmh0104-glymur.dtsi" /* SPMI0: SID-8/9 SPMI1: SID-11 */
-#include "pmk8850.dtsi" /* SPMI0: SID-0 */
-#include "smb2370.dtsi" /* SPMI2: SID-9/10/11 */
+#include "glymur-cob.dtsi"
#include <dt-bindings/input/gpio-keys.h>
#include <dt-bindings/leds/common.h>
@@ -376,205 +370,42 @@ vreg_pmu_pcie_1p8: ldo9 {
};
};
-&apps_rsc {
- regulators-0 {
- compatible = "qcom,pmh0101-rpmh-regulators";
- qcom,pmic-id = "B_E0";
-
- vreg_l1b0: ldo1 {
- regulator-name = "vreg_l1b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l7b0: ldo7 {
- regulator-name = "vreg_l7b0";
- regulator-min-microvolt = <3072000>;
- regulator-max-microvolt = <3072000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l8b0: ldo8 {
- regulator-name = "vreg_l8b0";
- regulator-min-microvolt = <3304000>;
- regulator-max-microvolt = <3304000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l9b0: ldo9 {
- regulator-name = "vreg_l9b0";
- regulator-min-microvolt = <2960000>;
- regulator-max-microvolt = <2960000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l10b0: ldo10 {
- regulator-name = "vreg_l10b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l11b0: ldo11 {
- regulator-name = "vreg_l11b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l12b0: ldo12 {
- regulator-name = "vreg_l12b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l15b0: ldo15 {
- regulator-name = "vreg_l15b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l17b0: ldo17 {
- regulator-name = "vreg_l17b0";
- regulator-min-microvolt = <2504000>;
- regulator-max-microvolt = <2504000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l18b0: ldo18 {
- regulator-name = "vreg_l18b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+&rpmh_vregs_b_e0 {
+ vreg_l8b0: ldo8 {
+ regulator-name = "vreg_l8b0";
+ regulator-min-microvolt = <3304000>;
+ regulator-max-microvolt = <3304000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- regulators-1 {
- compatible = "qcom,pmcx0102-rpmh-regulators";
- qcom,pmic-id = "C_E1";
-
- vreg_l1c1: ldo1 {
- regulator-name = "vreg_l1c1";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2c1: ldo2 {
- regulator-name = "vreg_l2c1";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3c1: ldo3 {
- regulator-name = "vreg_l3c1";
- regulator-min-microvolt = <936000>;
- regulator-max-microvolt = <936000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4c1: ldo4 {
- regulator-name = "vreg_l4c1";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_l12b0: ldo12 {
+ regulator-name = "vreg_l12b0";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- regulators-2 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E0";
+ vreg_l17b0: ldo17 {
+ regulator-name = "vreg_l17b0";
+ regulator-min-microvolt = <2504000>;
+ regulator-max-microvolt = <2504000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+};
- vreg_s7f0: smps7 {
- regulator-name = "vreg_s7f0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_s8f0: smps8 {
- regulator-name = "vreg_s8f0";
- regulator-min-microvolt = <952000>;
- regulator-max-microvolt = <952000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2f0: ldo2 {
- regulator-name = "vreg_l2f0";
- regulator-min-microvolt = <936000>;
- regulator-max-microvolt = <936000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3f0: ldo3 {
- regulator-name = "vreg_l3f0";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+&rpmh_vregs_f_e0 {
+ vreg_s7f0: smps7 {
+ regulator-name = "vreg_s7f0";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- regulators-3 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E1";
-
- vreg_l1f1: ldo1 {
- regulator-name = "vreg_l1f1";
- regulator-min-microvolt = <880000>;
- regulator-max-microvolt = <904000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2f1: ldo2 {
- regulator-name = "vreg_l2f1";
- regulator-min-microvolt = <880000>;
- regulator-max-microvolt = <880000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4f1: ldo4 {
- regulator-name = "vreg_l4f1";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
- };
-
- regulators-4 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "H_E0";
-
- vreg_l1h0: ldo1 {
- regulator-name = "vreg_l1h0";
- regulator-min-microvolt = <936000>;
- regulator-max-microvolt = <936000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2h0: ldo2 {
- regulator-name = "vreg_l2h0";
- regulator-min-microvolt = <880000>;
- regulator-max-microvolt = <880000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3h0: ldo3 {
- regulator-name = "vreg_l3h0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4h0: ldo4 {
- regulator-name = "vreg_l4h0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_s8f0: smps8 {
+ regulator-name = "vreg_s8f0";
+ regulator-min-microvolt = <952000>;
+ regulator-max-microvolt = <952000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
};
@@ -727,9 +558,6 @@ &mdss_dp3_out {
};
&mdss_dp3_phy {
- vdda-phy-supply = <&vreg_l2f1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -741,9 +569,6 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -777,9 +602,6 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f0>;
- vdda-pll-supply = <&vreg_l4h0>;
-
status = "okay";
};
@@ -798,9 +620,6 @@ &pcie6 {
};
&pcie6_phy {
- vdda-phy-supply = <&vreg_l1c1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -860,20 +679,7 @@ &remoteproc_soccp {
status = "okay";
};
-&smb2370_j_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-};
-
-&smb2370_k_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-};
-
&smb2370_l_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-
status = "okay";
};
@@ -933,26 +739,6 @@ right_tweeter: speaker@0,1 {
};
};
-&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
- vdda-refgen3-0p9-supply = <&vreg_l2f0>;
- vdda-refgen3-1p2-supply = <&vreg_l4h0>;
- vdda-refgen4-0p9-supply = <&vreg_l1f1>;
- vdda-refgen4-1p2-supply = <&vreg_l4f1>;
-};
-
&tlmm {
gpio-reserved-ranges = <4 4>, /* EC TZ Secure I3C */
<10 2>, /* OOB UART */
@@ -1142,9 +928,6 @@ &usb_0_dwc3_hs {
};
&usb_0_hsphy {
- vdd-supply = <&vreg_l3f0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&smb2370_j_e2_eusb2_repeater>;
status = "okay";
@@ -1171,9 +954,6 @@ &usb_1_dwc3_hs {
};
&usb_1_hsphy {
- vdd-supply = <&vreg_l3f0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&smb2370_k_e2_eusb2_repeater>;
status = "okay";
@@ -1200,9 +980,6 @@ &usb_2_dwc3_hs {
};
&usb_2_hsphy {
- vdd-supply = <&vreg_l4c1>;
- vdda12-supply = <&vreg_l4f1>;
-
phys = <&smb2370_l_e2_eusb2_repeater>;
status = "okay";
diff --git a/arch/arm64/boot/dts/qcom/glymur-qcb.dts b/arch/arm64/boot/dts/qcom/glymur-qcb.dts
index 3255ad66786e..d365544b0ea0 100644
--- a/arch/arm64/boot/dts/qcom/glymur-qcb.dts
+++ b/arch/arm64/boot/dts/qcom/glymur-qcb.dts
@@ -6,13 +6,7 @@
/dts-v1/;
#include "glymur.dtsi"
-
-#include "pmcx0102.dtsi" /* SPMI0: SID-2/3 SPMI1: SID-2/3 */
-#include "pmh0101.dtsi" /* SPMI0: SID-1 */
-#include "pmh0110-glymur.dtsi" /* SPMI0: SID-5/7 SPMI1: SID-5 */
-#include "pmh0104-glymur.dtsi" /* SPMI0: SID-8/9 SPMI1: SID-11 */
-#include "pmk8850.dtsi" /* SPMI0: SID-0 */
-#include "smb2370.dtsi" /* SPMI2: SID-9/10/11 */
+#include "glymur-cob.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Glymur QCB";
@@ -178,247 +172,72 @@ vreg_pmu_pcie_1p8: ldo9 {
};
};
-&apps_rsc {
- regulators-0 {
- compatible = "qcom,pmh0101-rpmh-regulators";
- qcom,pmic-id = "B_E0";
-
- vreg_bob1_e0: bob1 {
- regulator-name = "vreg_bob1_e0";
- regulator-min-microvolt = <2200000>;
- regulator-max-microvolt = <4224000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
- };
-
- vreg_bob2_e0: bob2 {
- regulator-name = "vreg_bob2_e0";
- regulator-min-microvolt = <2540000>;
- regulator-max-microvolt = <3600000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
- };
-
- vreg_l1b0: ldo1 {
- regulator-name = "vreg_l1b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2b0: ldo2 {
- regulator-name = "vreg_l2b0";
- regulator-min-microvolt = <2904000>;
- regulator-max-microvolt = <2904000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l7b0: ldo7 {
- regulator-name = "vreg_l7b0";
- regulator-min-microvolt = <2790000>;
- regulator-max-microvolt = <2792000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l8b0: ldo8 {
- regulator-name = "vreg_l8b0";
- regulator-min-microvolt = <1504000>;
- regulator-max-microvolt = <1504000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l9b0: ldo9 {
- regulator-name = "vreg_l9b0";
- regulator-min-microvolt = <2704000>;
- regulator-max-microvolt = <2704000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l10b0: ldo10 {
- regulator-name = "vreg_l10b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l11b0: ldo11 {
- regulator-name = "vreg_l11b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l12b0: ldo12 {
- regulator-name = "vreg_l12b0";
- regulator-min-microvolt = <1144000>;
- regulator-max-microvolt = <1144000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l15b0: ldo15 {
- regulator-name = "vreg_l15b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l17b0: ldo17 {
- regulator-name = "vreg_l17b0";
- regulator-min-microvolt = <2400000>;
- regulator-max-microvolt = <2700000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l18b0: ldo18 {
- regulator-name = "vreg_l18b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+&rpmh_vregs_b_e0 {
+ vreg_bob1_e0: bob1 {
+ regulator-name = "vreg_bob1_e0";
+ regulator-min-microvolt = <2200000>;
+ regulator-max-microvolt = <4224000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
};
- regulators-1 {
- compatible = "qcom,pmcx0102-rpmh-regulators";
- qcom,pmic-id = "C_E1";
-
- vreg_l1c1: ldo1 {
- regulator-name = "vreg_l1c1";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2c1: ldo2 {
- regulator-name = "vreg_l2c1";
- regulator-min-microvolt = <1144000>;
- regulator-max-microvolt = <1144000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3c1: ldo3 {
- regulator-name = "vreg_l3c1";
- regulator-min-microvolt = <890000>;
- regulator-max-microvolt = <980000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4c1: ldo4 {
- regulator-name = "vreg_l4c1";
- regulator-min-microvolt = <720000>;
- regulator-max-microvolt = <720000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_bob2_e0: bob2 {
+ regulator-name = "vreg_bob2_e0";
+ regulator-min-microvolt = <2540000>;
+ regulator-max-microvolt = <3600000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
};
- regulators-2 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E0";
-
- vreg_s7f0: smps7 {
- regulator-name = "vreg_s7f0";
- regulator-min-microvolt = <1320000>;
- regulator-max-microvolt = <1352000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_s8f0: smps8 {
- regulator-name = "vreg_s8f0";
- regulator-min-microvolt = <952000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_s9f0: smps9 {
- regulator-name = "vreg_s9f0";
- regulator-min-microvolt = <1900000>;
- regulator-max-microvolt = <2000000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2f0: ldo2 {
- regulator-name = "vreg_l2f0";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3f0: ldo3 {
- regulator-name = "vreg_l3f0";
- regulator-min-microvolt = <720000>;
- regulator-max-microvolt = <720000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4f0: ldo4 {
- regulator-name = "vreg_l4f0";
- regulator-min-microvolt = <1080000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_l8b0: ldo8 {
+ regulator-name = "vreg_l8b0";
+ regulator-min-microvolt = <1504000>;
+ regulator-max-microvolt = <1504000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- regulators-3 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E1";
-
- vreg_s7f1: smps7 {
- regulator-name = "vreg_s7f1";
- regulator-min-microvolt = <300000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l1f1: ldo1 {
- regulator-name = "vreg_l1f1";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2f1: ldo2 {
- regulator-name = "vreg_l2f1";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4f1: ldo4 {
- regulator-name = "vreg_l4f1";
- regulator-min-microvolt = <1080000>;
- regulator-max-microvolt = <1320000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_l12b0: ldo12 {
+ regulator-name = "vreg_l12b0";
+ regulator-min-microvolt = <1144000>;
+ regulator-max-microvolt = <1144000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- regulators-4 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "H_E0";
+ vreg_l17b0: ldo17 {
+ regulator-name = "vreg_l17b0";
+ regulator-min-microvolt = <2400000>;
+ regulator-max-microvolt = <2700000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+};
- vreg_l1h0: ldo1 {
- regulator-name = "vreg_l1h0";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+&rpmh_vregs_f_e0 {
+ vreg_l4f0: ldo4 {
+ regulator-name = "vreg_l4f0";
+ regulator-min-microvolt = <1080000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
- vreg_l2h0: ldo2 {
- regulator-name = "vreg_l2h0";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_s7f0: smps7 {
+ regulator-name = "vreg_s7f0";
+ regulator-min-microvolt = <1320000>;
+ regulator-max-microvolt = <1352000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
- vreg_l3h0: ldo3 {
- regulator-name = "vreg_l3h0";
- regulator-min-microvolt = <320000>;
- regulator-max-microvolt = <2000000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_s8f0: smps8 {
+ regulator-name = "vreg_s8f0";
+ regulator-min-microvolt = <952000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+};
- vreg_l4h0: ldo4 {
- regulator-name = "vreg_l4h0";
- regulator-min-microvolt = <1080000>;
- regulator-max-microvolt = <1320000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+&rpmh_vregs_f_e1 {
+ vreg_s7f1: smps7 {
+ regulator-name = "vreg_s7f1";
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
};
@@ -446,9 +265,6 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -482,9 +298,6 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f0>;
- vdda-pll-supply = <&vreg_l4h0>;
-
status = "okay";
};
@@ -503,9 +316,6 @@ &pcie6 {
};
&pcie6_phy {
- vdda-phy-supply = <&vreg_l1c1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -559,26 +369,6 @@ &remoteproc_soccp {
"qcom/glymur/soccp_dtb.mbn";
};
-&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
- vdda-refgen3-0p9-supply = <&vreg_l2f0>;
- vdda-refgen3-1p2-supply = <&vreg_l4h0>;
- vdda-refgen4-0p9-supply = <&vreg_l1f1>;
- vdda-refgen4-1p2-supply = <&vreg_l4f1>;
-};
-
&tlmm {
gpio-reserved-ranges = <4 4>, /* EC TZ Secure I3C */
<10 2>, /* OOB UART */
diff --git a/arch/arm64/boot/dts/qcom/mahua-crd.dts b/arch/arm64/boot/dts/qcom/mahua-crd.dts
index 51708954f17a..8a36d0caaf9e 100644
--- a/arch/arm64/boot/dts/qcom/mahua-crd.dts
+++ b/arch/arm64/boot/dts/qcom/mahua-crd.dts
@@ -26,17 +26,16 @@ &pcie3b_phy {
};
&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
+ /delete-property/ vdda-qrefrx4-0p9-supply;
+ /delete-property/ vdda-qrefrx5-0p9-supply;
+ /delete-property/ vdda-qreftx0-0p9-supply;
+ /delete-property/ vdda-qreftx0-1p2-supply;
+ /delete-property/ vdda-refgen4-0p9-supply;
+ /delete-property/ vdda-refgen4-1p2-supply;
+
vdda-qrefrpt3-0p9-supply = <&vreg_l1f1>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
vdda-qrefrpt5-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
vdda-qrefrx3-0p9-supply = <&vreg_l2h0>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
vdda-refgen3-0p9-supply = <&vreg_l1f1>;
vdda-refgen3-1p2-supply = <&vreg_l4f1>;
};
diff --git a/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts b/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts
index 860e9ef01aa6..a77eb7565804 100644
--- a/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts
+++ b/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts
@@ -6,13 +6,6 @@
#include "mahua.dtsi"
-#include "pmcx0102.dtsi"
-#include "pmh0101.dtsi"
-#include "pmh0110-glymur.dtsi"
-#include "pmh0104-glymur.dtsi"
-#include "pmk8850.dtsi"
-#include "smb2370.dtsi"
-
#include <dt-bindings/input/gpio-keys.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/leds/common.h>
@@ -388,249 +381,72 @@ vreg_pmu_pcie_1p8: ldo9 {
};
};
-&apps_rsc {
- regulators-0 {
- compatible = "qcom,pmh0101-rpmh-regulators";
- qcom,pmic-id = "B_E0";
-
- vreg_bob1_e0: bob1 {
- regulator-name = "vreg_bob1_e0";
- regulator-min-microvolt = <2200000>;
- regulator-max-microvolt = <4224000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
- };
-
- vreg_bob2_e0: bob2 {
- regulator-name = "vreg_bob2_e0";
- regulator-min-microvolt = <2540000>;
- regulator-max-microvolt = <3600000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
- };
-
- vreg_l1b0: ldo1 {
- regulator-name = "vreg_l1b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2b0: ldo2 {
- regulator-name = "vreg_l2b0";
- regulator-min-microvolt = <2904000>;
- regulator-max-microvolt = <2904000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l7b0: ldo7 {
- regulator-name = "vreg_l7b0";
- regulator-min-microvolt = <2790000>;
- regulator-max-microvolt = <2792000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l8b0: ldo8 {
- regulator-name = "vreg_l8b0";
- regulator-min-microvolt = <1504000>;
- regulator-max-microvolt = <3304000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l9b0: ldo9 {
- regulator-name = "vreg_l9b0";
- regulator-min-microvolt = <2704000>;
- regulator-max-microvolt = <2960000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l10b0: ldo10 {
- regulator-name = "vreg_l10b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l11b0: ldo11 {
- regulator-name = "vreg_l11b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l12b0: ldo12 {
- regulator-name = "vreg_l12b0";
- regulator-min-microvolt = <1144000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l15b0: ldo15 {
- regulator-name = "vreg_l15b0";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-always-on;
- };
-
- vreg_l17b0: ldo17 {
- regulator-name = "vreg_l17b0";
- regulator-min-microvolt = <2400000>;
- regulator-max-microvolt = <2700000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l18b0: ldo18 {
- regulator-name = "vreg_l18b0";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- regulator-always-on;
- };
+&rpmh_vregs_b_e0 {
+ vreg_bob1_e0: bob1 {
+ regulator-name = "vreg_bob1_e0";
+ regulator-min-microvolt = <2200000>;
+ regulator-max-microvolt = <4224000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
};
- regulators-1 {
- compatible = "qcom,pmcx0102-rpmh-regulators";
- qcom,pmic-id = "C_E1";
-
- vreg_l1c1: ldo1 {
- regulator-name = "vreg_l1c1";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2c1: ldo2 {
- regulator-name = "vreg_l2c1";
- regulator-min-microvolt = <1144000>;
- regulator-max-microvolt = <1144000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3c1: ldo3 {
- regulator-name = "vreg_l3c1";
- regulator-min-microvolt = <890000>;
- regulator-max-microvolt = <980000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4c1: ldo4 {
- regulator-name = "vreg_l4c1";
- regulator-min-microvolt = <720000>;
- regulator-max-microvolt = <720000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_bob2_e0: bob2 {
+ regulator-name = "vreg_bob2_e0";
+ regulator-min-microvolt = <2540000>;
+ regulator-max-microvolt = <3600000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
};
- regulators-2 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E0";
-
- vreg_s7f0: smps7 {
- regulator-name = "vreg_s7f0";
- regulator-min-microvolt = <1320000>;
- regulator-max-microvolt = <1352000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_s8f0: smps8 {
- regulator-name = "vreg_s8f0";
- regulator-min-microvolt = <952000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_s9f0: smps9 {
- regulator-name = "vreg_s9f0";
- regulator-min-microvolt = <1900000>;
- regulator-max-microvolt = <2000000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2f0: ldo2 {
- regulator-name = "vreg_l2f0";
- regulator-min-microvolt = <936000>;
- regulator-max-microvolt = <936000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l3f0: ldo3 {
- regulator-name = "vreg_l3f0";
- regulator-min-microvolt = <912000>;
- regulator-max-microvolt = <912000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4f0: ldo4 {
- regulator-name = "vreg_l4f0";
- regulator-min-microvolt = <1080000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_l8b0: ldo8 {
+ regulator-name = "vreg_l8b0";
+ regulator-min-microvolt = <1504000>;
+ regulator-max-microvolt = <3304000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- regulators-3 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "F_E1";
-
- vreg_s7f1: smps7 {
- regulator-name = "vreg_s7f1";
- regulator-min-microvolt = <300000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l1f1: ldo1 {
- regulator-name = "vreg_l1f1";
- regulator-min-microvolt = <880000>;
- regulator-max-microvolt = <880000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l2f1: ldo2 {
- regulator-name = "vreg_l2f1";
- regulator-min-microvolt = <904000>;
- regulator-max-microvolt = <904000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
- vreg_l4f1: ldo4 {
- regulator-name = "vreg_l4f1";
- regulator-min-microvolt = <1200000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_l12b0: ldo12 {
+ regulator-name = "vreg_l12b0";
+ regulator-min-microvolt = <1144000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
- regulators-4 {
- compatible = "qcom,pmh0110-rpmh-regulators";
- qcom,pmic-id = "H_E0";
+ vreg_l17b0: ldo17 {
+ regulator-name = "vreg_l17b0";
+ regulator-min-microvolt = <2400000>;
+ regulator-max-microvolt = <2700000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+};
- vreg_l1h0: ldo1 {
- regulator-name = "vreg_l1h0";
- regulator-min-microvolt = <936000>;
- regulator-max-microvolt = <936000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+&rpmh_vregs_f_e0 {
+ vreg_l4f0: ldo4 {
+ regulator-name = "vreg_l4f0";
+ regulator-min-microvolt = <1080000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
- vreg_l2h0: ldo2 {
- regulator-name = "vreg_l2h0";
- regulator-min-microvolt = <832000>;
- regulator-max-microvolt = <832000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_s7f0: smps7 {
+ regulator-name = "vreg_s7f0";
+ regulator-min-microvolt = <1320000>;
+ regulator-max-microvolt = <1352000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
- vreg_l3h0: ldo3 {
- regulator-name = "vreg_l3h0";
- regulator-min-microvolt = <320000>;
- regulator-max-microvolt = <2000000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+ vreg_s8f0: smps8 {
+ regulator-name = "vreg_s8f0";
+ regulator-min-microvolt = <952000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+ };
+};
- vreg_l4h0: ldo4 {
- regulator-name = "vreg_l4h0";
- regulator-min-microvolt = <1080000>;
- regulator-max-microvolt = <1320000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
+&rpmh_vregs_f_e1 {
+ vreg_s7f1: smps7 {
+ regulator-name = "vreg_s7f1";
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
};
};
@@ -739,7 +555,6 @@ &lpass_vamacro {
pinctrl-0 = <&dmic01_default>;
pinctrl-names = "default";
qcom,dmic-sample-rate = <4800000>;
- vdd-micb-supply = <&vreg_l1b0>;
};
&mdss {
@@ -796,9 +611,6 @@ &mdss_dp3_out {
};
&mdss_dp3_phy {
- vdda-phy-supply = <&vreg_l2f1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -811,9 +623,6 @@ &pcie4 {
};
&pcie4_phy {
- vdda-phy-supply = <&vreg_l1c1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -848,9 +657,6 @@ &pcie5 {
};
&pcie5_phy {
- vdda-phy-supply = <&vreg_l2f0>;
- vdda-pll-supply = <&vreg_l4h0>;
-
status = "okay";
};
@@ -870,9 +676,6 @@ &pcie6 {
};
&pcie6_phy {
- vdda-phy-supply = <&vreg_l1c1>;
- vdda-pll-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -948,36 +751,9 @@ right_spkr: speaker@0,1 {
};
};
-&smb2370_j_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-};
-
-&smb2370_k_e2_eusb2_repeater {
- vdd18-supply = <&vreg_l15b0>;
- vdd3-supply = <&vreg_l7b0>;
-};
-
&tcsr {
- vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
vdda-qrefrpt5-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
- vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
vdda-qrefrx3-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
- vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
- vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
- vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
- vdda-refgen3-0p9-supply = <&vreg_l2f0>;
- vdda-refgen3-1p2-supply = <&vreg_l4h0>;
- vdda-refgen4-0p9-supply = <&vreg_l1f1>;
- vdda-refgen4-1p2-supply = <&vreg_l4f1>;
};
&tlmm {
@@ -1149,19 +925,12 @@ &usb_0_dwc3_hs {
};
&usb_0_hsphy {
- vdd-supply = <&vreg_l3f0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&smb2370_j_e2_eusb2_repeater>;
status = "okay";
};
&usb_0_qmpphy {
- vdda-phy-supply = <&vreg_l3f0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l2f0>;
-
status = "okay";
};
@@ -1178,19 +947,12 @@ &usb_1_dwc3_hs {
};
&usb_1_hsphy {
- vdd-supply = <&vreg_l3f0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&smb2370_k_e2_eusb2_repeater>;
status = "okay";
};
&usb_1_qmpphy {
- vdda-phy-supply = <&vreg_l1h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l2f0>;
-
status = "okay";
};
@@ -1203,36 +965,22 @@ &usb_mp {
};
&usb_mp_hsphy0 {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&ptn3222_0>;
status = "okay";
};
&usb_mp_hsphy1 {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&ptn3222_1>;
//USB-A..
status = "okay";
};
&usb_mp_qmpphy0 {
- vdda-phy-supply = <&vreg_l2h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l4f1>;
-
status = "okay";
};
&usb_mp_qmpphy1 {
- vdda-phy-supply = <&vreg_l2h0>;
- vdda-pll-supply = <&vreg_l4h0>;
- refgen-supply = <&vreg_l4f1>;
-
status = "okay";
};
@@ -1243,9 +991,6 @@ &usb_hs {
};
&usb_hs_phy {
- vdd-supply = <&vreg_l2h0>;
- vdda12-supply = <&vreg_l4h0>;
-
phys = <&ptn3222_cam>;
status = "okay";
@@ -1263,9 +1008,6 @@ &usb_2 {
};
&usb_2_hsphy {
- vdd-supply = <&vreg_l4c1>;
- vdda12-supply = <&vreg_l4f1>;
-
phys = <&ptn3222_fpr>;
status = "okay";
diff --git a/arch/arm64/boot/dts/qcom/mahua.dtsi b/arch/arm64/boot/dts/qcom/mahua.dtsi
index a59c5ed7b48e..16f62040aa84 100644
--- a/arch/arm64/boot/dts/qcom/mahua.dtsi
+++ b/arch/arm64/boot/dts/qcom/mahua.dtsi
@@ -5,6 +5,7 @@
/* Mahua is heavily based on Glymur, with some meaningful differences */
#include "glymur.dtsi"
+#include "glymur-cob.dtsi"
/delete-node/ &bwmon_cluster2;
/delete-node/ &cluster2_pd;
@@ -399,4 +400,3 @@ &tsens4 {
&tsens5 {
#qcom,sensors = <15>;
};
-
--
2.56.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] arm64: dts: qcom: glymur-crd: Drop L4F0
2026-10-28 20:04 [PATCH 0/3] Commonize Glymur regulator settings for fixed rails Konrad Dybcio
2026-10-28 20:04 ` [PATCH 1/3] arm64: dts: qcom: Unify Glymur/Mahua regulator handles Konrad Dybcio
2026-10-28 20:04 ` [PATCH 2/3] arm64: dts: qcom: Consolidate Glymur CoB power grid Konrad Dybcio
@ 2026-10-28 20:04 ` Konrad Dybcio
2 siblings, 0 replies; 5+ messages in thread
From: Konrad Dybcio @ 2026-10-28 20:04 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, Dmitry Baryshkov,
Gopikrishna Garmidi
Cc: linux-arm-msm, devicetree, linux-kernel, Konrad Dybcio
From: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
This is VDD_LPI_MX, already controlled by RPMH as an ARC/RPMHPD.
Drop it.
Fixes: a5ad8a8e473c ("arm64: dts: qcom: Commonize Glymur CRD DTSI")
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/glymur-crd.dtsi | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/glymur-crd.dtsi b/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
index 422ed0308147..422b3778c22a 100644
--- a/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
+++ b/arch/arm64/boot/dts/qcom/glymur-crd.dtsi
@@ -390,13 +390,6 @@ vreg_l17b0: ldo17 {
};
&rpmh_vregs_f_e0 {
- vreg_l4f0: ldo4 {
- regulator-name = "vreg_l4f0";
- regulator-min-microvolt = <1080000>;
- regulator-max-microvolt = <1200000>;
- regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
- };
-
vreg_s7f0: smps7 {
regulator-name = "vreg_s7f0";
regulator-min-microvolt = <1320000>;
--
2.56.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] arm64: dts: qcom: Consolidate Glymur CoB power grid
2026-10-28 20:04 ` [PATCH 2/3] arm64: dts: qcom: Consolidate Glymur CoB power grid Konrad Dybcio
@ 2026-10-28 20:17 ` sashiko-bot
0 siblings, 0 replies; 5+ messages in thread
From: sashiko-bot @ 2026-10-28 20:17 UTC (permalink / raw)
To: Konrad Dybcio; +Cc: devicetree, robh, conor+dt
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:
- [High] arm64: dts: qcom: invalid step voltages on vreg_l7b0 and vreg_s9f0
- [Medium] arm64: dts: qcom: yoga-slim7x retains swapped USB QMP PHY supplies
- [Medium] arm64: dts: qcom: mahua-tcsr QREF fixups missing from mahua.dtsi
--
commit e05c2da4bef582e863ac9bb6fa079eb8effdd101
Author: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
arm64: dts: qcom: Consolidate Glymur CoB power grid
This commit factors out the common PMIC includes, RPMH regulator definitions,
and on-SoC peripheral supply properties for Glymur CoB devices into a shared
glymur-cob.dtsi file and updates the board and Mahua device trees to use it.
> diff --git a/arch/arm64/boot/dts/qcom/glymur-cob.dtsi b/arch/arm64/boot/dts/qcom/glymur-cob.dtsi
> new file mode 100644
> index 0000000000000..8b4ba1d384a0d
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/glymur-cob.dtsi
> @@ -0,0 +1,310 @@
[ ... ]
> +&apps_rsc {
> + rpmh_vregs_b_e0: regulators-0 {
> + compatible = "qcom,pmh0101-rpmh-regulators";
> + qcom,pmic-id = "B_E0";
> +
> + vreg_l1b0: ldo1 {
> + regulator-name = "vreg_l1b0";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + };
> +
> + vreg_l7b0: ldo7 {
> + regulator-name = "vreg_l7b0";
> + regulator-min-microvolt = <3100000>;
> + regulator-max-microvolt = <3100000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + };
[ ... ]
> + rpmh_vregs_f_e0: regulators-2 {
> + compatible = "qcom,pmh0110-rpmh-regulators";
> + qcom,pmic-id = "F_E0";
> +
> + vreg_l2f0: ldo2 {
> + regulator-name = "vreg_l2f0";
> + regulator-min-microvolt = <944000>;
> + regulator-max-microvolt = <944000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + };
> +
> + vreg_l3f0: ldo3 {
> + regulator-name = "vreg_l3f0";
> + regulator-min-microvolt = <912000>;
> + regulator-max-microvolt = <912000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + };
> +
> + /* Voltage input for PMCX0104 */
> + vreg_s9f0: smps9 {
> + regulator-name = "vreg_s9f0";
> + regulator-min-microvolt = <1900000>;
> + regulator-max-microvolt = <1900000>;
> + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> + };
> + };
[Severity: High]
Will setting regulator-min-microvolt == regulator-max-microvolt to 3100000 on
vreg_l7b0 (ldo7 on pmh0101) and 1900000 on vreg_s9f0 (smps9 on pmh0110) cause
rpmh_regulator_probe() to fail with -EINVAL for both the B_E0 and F_E0 PMIC
regulator nodes?
In drivers/regulator/qcom-rpmh-regulator.c, pmh0101_vreg_data maps ldo7 to
pmic5_pldo530_mvp300:
static const struct rpmh_vreg_hw_data pmic5_pldo530_mvp300 = {
.regulator_type = VRM,
.ops = &rpmh_regulator_vrm_drms_ops,
.voltage_ranges = (struct linear_range[]) {
REGULATOR_LINEAR_RANGE(1504000, 0, 255, 8000),
},
Because (3100000 - 1504000) / 8000 is 199.5, 3100000 uV lies halfway between
the valid hardware steps 3096000 uV and 3104000 uV.
Similarly, pmh0110_vreg_data maps smps9 to pmic5_ftsmps530:
static const struct rpmh_vreg_hw_data pmic5_ftsmps530 = {
.regulator_type = VRM,
.ops = &rpmh_regulator_vrm_ops,
.voltage_ranges = (struct linear_range[]) {
REGULATOR_LINEAR_RANGE(252000, 0, 305, 4000),
REGULATOR_LINEAR_RANGE(1480000, 306, 464, 8000),
},
Because (1900000 - 1480000) / 8000 is 52.5, 1900000 uV lies halfway between
the valid hardware steps 1896000 uV and 1904000 uV (previously vreg_s9f0 used
a range of 1900000 to 2000000 uV, which contained valid steps).
When rpmh_regulator_probe() -> rpmh_regulator_init_vreg() ->
devm_regulator_register() -> set_machine_constraints() ->
machine_constraints_voltage() checks a fixed constraint where cmin == cmax is
not an exact hardware step, clamping produces max_uV < min_uV (3096000 <
3104000 for vreg_l7b0, and 1896000 < 1904000 for vreg_s9f0) and returns
-EINVAL, aborting registration of the entire PMIC regulator block in
rpmh_regulator_probe():
ret = rpmh_regulator_init_vreg(vreg, dev, node, pmic_id,
vreg_data);
if (ret < 0)
return ret;
> diff --git a/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts
> index 56c22daab0569..a8580499e7093 100644
> --- a/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts
> +++ b/arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts
[ ... ]
> @@ -1142,9 +928,6 @@ &usb_0_dwc3_hs {
> };
>
> &usb_0_hsphy {
> - vdd-supply = <&vreg_l3f0>;
> - vdda12-supply = <&vreg_l4h0>;
> -
> phys = <&smb2370_j_e2_eusb2_repeater>;
>
> status = "okay";
> @@ -1171,9 +954,6 @@ &usb_1_dwc3_hs {
> };
>
> &usb_1_hsphy {
> - vdd-supply = <&vreg_l3f0>;
> - vdda12-supply = <&vreg_l4h0>;
> -
> phys = <&smb2370_k_e2_eusb2_repeater>;
>
> status = "okay";
> @@ -1200,9 +980,6 @@ &usb_2_dwc3_hs {
> };
>
> &usb_2_hsphy {
> - vdd-supply = <&vreg_l4c1>;
> - vdda12-supply = <&vreg_l4f1>;
> -
> phys = <&smb2370_l_e2_eusb2_repeater>;
>
> status = "okay";
[Severity: Medium]
Should the local supply properties on &usb_0_qmpphy, &usb_1_qmpphy, and
&usb_2_qmpphy in arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts also
be removed so they inherit the consolidated definitions from glymur-cob.dtsi?
Right after each of the hsphy nodes above, glymur-lenovo-yoga-slim7x.dts still
has:
&usb_0_qmpphy {
vdda-phy-supply = <&vreg_l4h0>;
vdda-pll-supply = <&vreg_l3f0>;
refgen-supply = <&vreg_l2f0>;
status = "okay";
};
...
&usb_1_qmpphy {
vdda-phy-supply = <&vreg_l4h0>;
vdda-pll-supply = <&vreg_l1h0>;
refgen-supply = <&vreg_l2f0>;
status = "okay";
};
...
&usb_2_qmpphy {
vdda-phy-supply = <&vreg_l4f1>;
vdda-pll-supply = <&vreg_l4c1>;
refgen-supply = <&vreg_l1c1>;
status = "okay";
};
Those local properties override glymur-cob.dtsi with the 1.2 V rails
(vreg_l4h0, vreg_l4f1) and 0.9 V rails (vreg_l3f0, vreg_l1h0, vreg_l4c1)
swapped between vdda-phy-supply and vdda-pll-supply, and with vreg_l1c1 on
&usb_2_qmpphy refgen-supply.
> diff --git a/arch/arm64/boot/dts/qcom/mahua-crd.dts b/arch/arm64/boot/dts/qcom/mahua-crd.dts
> index 51708954f17a7..8a36d0caaf9e2 100644
> --- a/arch/arm64/boot/dts/qcom/mahua-crd.dts
> +++ b/arch/arm64/boot/dts/qcom/mahua-crd.dts
> @@ -26,17 +26,16 @@ &pcie3b_phy {
> };
>
> &tcsr {
> - vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
> - vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
> - vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
> + /delete-property/ vdda-qrefrx4-0p9-supply;
> + /delete-property/ vdda-qrefrx5-0p9-supply;
> + /delete-property/ vdda-qreftx0-0p9-supply;
> + /delete-property/ vdda-qreftx0-1p2-supply;
> + /delete-property/ vdda-refgen4-0p9-supply;
> + /delete-property/ vdda-refgen4-1p2-supply;
> +
> vdda-qrefrpt3-0p9-supply = <&vreg_l1f1>;
> - vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
> vdda-qrefrpt5-0p9-supply = <&vreg_l2h0>;
> - vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
> - vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
> - vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
> vdda-qrefrx3-0p9-supply = <&vreg_l2h0>;
> - vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
> vdda-refgen3-0p9-supply = <&vreg_l1f1>;
> vdda-refgen3-1p2-supply = <&vreg_l4f1>;
> };
> diff --git a/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts b/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts
> index 860e9ef01aa6f..a77eb75658047 100644
> --- a/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts
> +++ b/arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts
[ ... ]
> @@ -948,36 +751,9 @@ right_spkr: speaker@0,1 {
> };
> };
>
> -&smb2370_j_e2_eusb2_repeater {
> - vdd18-supply = <&vreg_l15b0>;
> - vdd3-supply = <&vreg_l7b0>;
> -};
> -
> -&smb2370_k_e2_eusb2_repeater {
> - vdd18-supply = <&vreg_l15b0>;
> - vdd3-supply = <&vreg_l7b0>;
> -};
> -
> &tcsr {
> - vdda-qrefrpt0-0p9-supply = <&vreg_l2f1>;
> - vdda-qrefrpt1-0p9-supply = <&vreg_l2f1>;
> - vdda-qrefrpt2-0p9-supply = <&vreg_l2f1>;
> - vdda-qrefrpt3-0p9-supply = <&vreg_l2h0>;
> - vdda-qrefrpt4-0p9-supply = <&vreg_l2h0>;
> vdda-qrefrpt5-0p9-supply = <&vreg_l2h0>;
> - vdda-qrefrx0-0p9-supply = <&vreg_l2f1>;
> - vdda-qrefrx1-0p9-supply = <&vreg_l2f1>;
> - vdda-qrefrx2-0p9-supply = <&vreg_l2f1>;
> vdda-qrefrx3-0p9-supply = <&vreg_l2h0>;
> - vdda-qrefrx4-0p9-supply = <&vreg_l2h0>;
> - vdda-qrefrx5-0p9-supply = <&vreg_l3f0>;
> - vdda-qreftx0-0p9-supply = <&vreg_l3f0>;
> - vdda-qreftx0-1p2-supply = <&vreg_l4h0>;
> - vdda-qreftx1-0p9-supply = <&vreg_l1f1>;
> - vdda-refgen3-0p9-supply = <&vreg_l2f0>;
> - vdda-refgen3-1p2-supply = <&vreg_l4h0>;
> - vdda-refgen4-0p9-supply = <&vreg_l1f1>;
> - vdda-refgen4-1p2-supply = <&vreg_l4f1>;
> };
[ ... ]
> diff --git a/arch/arm64/boot/dts/qcom/mahua.dtsi b/arch/arm64/boot/dts/qcom/mahua.dtsi
> index a59c5ed7b48e7..16f62040aa84b 100644
> --- a/arch/arm64/boot/dts/qcom/mahua.dtsi
> +++ b/arch/arm64/boot/dts/qcom/mahua.dtsi
> @@ -5,6 +5,7 @@
>
> /* Mahua is heavily based on Glymur, with some meaningful differences */
> #include "glymur.dtsi"
> +#include "glymur-cob.dtsi"
[Severity: Medium]
Since mahua.dtsi now includes glymur-cob.dtsi and sets &tcsr compatible to
"qcom,mahua-tcsr", should the Mahua-specific &tcsr property deletions and
supply overrides in mahua-crd.dts live in mahua.dtsi (or a Mahua CoB dtsi)
instead?
With those &tcsr changes placed only in mahua-crd.dts,
mahua-lenovo-thinkpad-t14s-gen7-lcd.dts only overrides vdda-qrefrpt5-0p9-supply
and vdda-qrefrx3-0p9-supply, leaving it with Glymur's refgen3 and qrefrpt3
supplies (vreg_l2f0, vreg_l4h0, vreg_l2h0 instead of vreg_l1f1 and vreg_l4f1)
as well as the unused Glymur-only qrefrx4, qrefrx5, qreftx0, and refgen4
properties from glymur-cob.dtsi.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261028-topic-sip_cob-v1-0-80ab6704aca3@oss.qualcomm.com?part=2
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-10-28 20:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-10-28 20:04 [PATCH 0/3] Commonize Glymur regulator settings for fixed rails Konrad Dybcio
2026-10-28 20:04 ` [PATCH 1/3] arm64: dts: qcom: Unify Glymur/Mahua regulator handles Konrad Dybcio
2026-10-28 20:04 ` [PATCH 2/3] arm64: dts: qcom: Consolidate Glymur CoB power grid Konrad Dybcio
2026-10-28 20:17 ` sashiko-bot
2026-10-28 20:04 ` [PATCH 3/3] arm64: dts: qcom: glymur-crd: Drop L4F0 Konrad Dybcio
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox