Name the regulators for QCM6490 Fairphone 5 & SHIFTphone 8

[PATCH 2/2] arm64: dts: qcom: qcm6490-shift-otter: Name the regulators

Posted by Luca Weiss 1 year, 7 months ago

Without explicitly specifying names for the regulators they are named
based on the DeviceTree node name. This results in multiple regulators
with the same name, making debug prints and regulator_summary impossible
to reason about.

Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
 arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
index e82938cab953..4667e47a74bc 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
@@ -235,46 +235,54 @@ regulators-0 {
 		qcom,pmic-id = "b";
 
 		vreg_s1b: smps1 {
+			regulator-name = "vreg_s1b";
 			regulator-min-microvolt = <1840000>;
 			regulator-max-microvolt = <2040000>;
 		};
 
 		vreg_s7b: smps7 {
+			regulator-name = "vreg_s7b";
 			regulator-min-microvolt = <535000>;
 			regulator-max-microvolt = <1120000>;
 		};
 
 		vreg_s8b: smps8 {
+			regulator-name = "vreg_s8b";
 			regulator-min-microvolt = <1200000>;
 			regulator-max-microvolt = <1500000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_RET>;
 		};
 
 		vreg_l1b: ldo1 {
+			regulator-name = "vreg_l1b";
 			regulator-min-microvolt = <825000>;
 			regulator-max-microvolt = <925000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l2b: ldo2 {
+			regulator-name = "vreg_l2b";
 			regulator-min-microvolt = <2700000>;
 			regulator-max-microvolt = <3544000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l3b: ldo3 {
+			regulator-name = "vreg_l3b";
 			regulator-min-microvolt = <312000>;
 			regulator-max-microvolt = <910000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l6b: ldo6 {
+			regulator-name = "vreg_l6b";
 			regulator-min-microvolt = <1140000>;
 			regulator-max-microvolt = <1260000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l7b: ldo7 {
+			regulator-name = "vreg_l7b";
 			/* Constrained for UFS VCC, at least until UFS driver scales voltage */
 			regulator-min-microvolt = <2952000>;
 			regulator-max-microvolt = <2952000>;
@@ -282,66 +290,77 @@ vreg_l7b: ldo7 {
 		};
 
 		vreg_l8b: ldo8 {
+			regulator-name = "vreg_l8b";
 			regulator-min-microvolt = <870000>;
 			regulator-max-microvolt = <970000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l9b: ldo9 {
+			regulator-name = "vreg_l9b";
 			regulator-min-microvolt = <1200000>;
 			regulator-max-microvolt = <1304000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l11b: ldo11 {
+			regulator-name = "vreg_l11b";
 			regulator-min-microvolt = <1504000>;
 			regulator-max-microvolt = <2000000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l12b: ldo12 {
+			regulator-name = "vreg_l12b";
 			regulator-min-microvolt = <751000>;
 			regulator-max-microvolt = <824000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l13b: ldo13 {
+			regulator-name = "vreg_l13b";
 			regulator-min-microvolt = <530000>;
 			regulator-max-microvolt = <824000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l14b: ldo14 {
+			regulator-name = "vreg_l14b";
 			regulator-min-microvolt = <1080000>;
 			regulator-max-microvolt = <1304000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l15b: ldo15 {
+			regulator-name = "vreg_l15b";
 			regulator-min-microvolt = <765000>;
 			regulator-max-microvolt = <1020000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l16b: ldo16 {
+			regulator-name = "vreg_l16b";
 			regulator-min-microvolt = <1100000>;
 			regulator-max-microvolt = <1300000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l17b: ldo17 {
+			regulator-name = "vreg_l17b";
 			regulator-min-microvolt = <1700000>;
 			regulator-max-microvolt = <1900000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l18b: ldo18 {
+			regulator-name = "vreg_l18b";
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <2000000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l19b: ldo19 {
+			regulator-name = "vreg_l19b";
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <2000000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
@@ -353,96 +372,112 @@ regulators-1 {
 		qcom,pmic-id = "c";
 
 		vreg_s1c: smps1 {
+			regulator-name = "vreg_s1c";
 			regulator-min-microvolt = <2190000>;
 			regulator-max-microvolt = <2210000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_s9c: smps9 {
+			regulator-name = "vreg_s9c";
 			regulator-min-microvolt = <1010000>;
 			regulator-max-microvolt = <1170000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l1c: ldo1 {
+			regulator-name = "vreg_l1c";
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <1980000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l2c: ldo2 {
+			regulator-name = "vreg_l2c";
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <1950000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l3c: ldo3 {
+			regulator-name = "vreg_l3c";
 			regulator-min-microvolt = <3000000>;
 			regulator-max-microvolt = <3400000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l4c: ldo4 {
+			regulator-name = "vreg_l4c";
 			regulator-min-microvolt = <1620000>;
 			regulator-max-microvolt = <3300000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l5c: ldo5 {
+			regulator-name = "vreg_l5c";
 			regulator-min-microvolt = <1620000>;
 			regulator-max-microvolt = <3300000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l6c: ldo6 {
+			regulator-name = "vreg_l6c";
 			regulator-min-microvolt = <1650000>;
 			regulator-max-microvolt = <3544000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l7c: ldo7 {
+			regulator-name = "vreg_l7c";
 			regulator-min-microvolt = <3000000>;
 			regulator-max-microvolt = <3544000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l8c: ldo8 {
+			regulator-name = "vreg_l8c";
 			regulator-min-microvolt = <1620000>;
 			regulator-max-microvolt = <2000000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l9c: ldo9 {
+			regulator-name = "vreg_l9c";
 			regulator-min-microvolt = <2700000>;
 			regulator-max-microvolt = <3544000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l10c: ldo10 {
+			regulator-name = "vreg_l10c";
 			regulator-min-microvolt = <720000>;
 			regulator-max-microvolt = <1050000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l11c: ldo11 {
+			regulator-name = "vreg_l11c";
 			regulator-min-microvolt = <2800000>;
 			regulator-max-microvolt = <3544000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l12c: ldo12 {
+			regulator-name = "vreg_l12c";
 			regulator-min-microvolt = <1650000>;
 			regulator-max-microvolt = <2000000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_l13c: ldo13 {
+			regulator-name = "vreg_l13c";
 			regulator-min-microvolt = <2700000>;
 			regulator-max-microvolt = <3544000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
 		};
 
 		vreg_bob: bob {
+			regulator-name = "vreg_bob";
 			regulator-min-microvolt = <3008000>;
 			regulator-max-microvolt = <3960000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;

-- 
2.45.2

Re: [PATCH 2/2] arm64: dts: qcom: qcm6490-shift-otter: Name the regulators

Posted by Caleb Connolly 1 year, 7 months ago


On 18/06/2024 15:30, Luca Weiss wrote:
> Without explicitly specifying names for the regulators they are named
> based on the DeviceTree node name. This results in multiple regulators
> with the same name, making debug prints and regulator_summary impossible
> to reason about.
> 
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>

Reviewed-by: Caleb Connolly <caleb@postmarketos.org>
> ---
>   arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts | 35 ++++++++++++++++++++++++
>   1 file changed, 35 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
> index e82938cab953..4667e47a74bc 100644
> --- a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
> +++ b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
> @@ -235,46 +235,54 @@ regulators-0 {
>   		qcom,pmic-id = "b";
>   
>   		vreg_s1b: smps1 {
> +			regulator-name = "vreg_s1b";
>   			regulator-min-microvolt = <1840000>;
>   			regulator-max-microvolt = <2040000>;
>   		};
>   
>   		vreg_s7b: smps7 {
> +			regulator-name = "vreg_s7b";
>   			regulator-min-microvolt = <535000>;
>   			regulator-max-microvolt = <1120000>;
>   		};
>   
>   		vreg_s8b: smps8 {
> +			regulator-name = "vreg_s8b";
>   			regulator-min-microvolt = <1200000>;
>   			regulator-max-microvolt = <1500000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_RET>;
>   		};
>   
>   		vreg_l1b: ldo1 {
> +			regulator-name = "vreg_l1b";
>   			regulator-min-microvolt = <825000>;
>   			regulator-max-microvolt = <925000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l2b: ldo2 {
> +			regulator-name = "vreg_l2b";
>   			regulator-min-microvolt = <2700000>;
>   			regulator-max-microvolt = <3544000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l3b: ldo3 {
> +			regulator-name = "vreg_l3b";
>   			regulator-min-microvolt = <312000>;
>   			regulator-max-microvolt = <910000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l6b: ldo6 {
> +			regulator-name = "vreg_l6b";
>   			regulator-min-microvolt = <1140000>;
>   			regulator-max-microvolt = <1260000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l7b: ldo7 {
> +			regulator-name = "vreg_l7b";
>   			/* Constrained for UFS VCC, at least until UFS driver scales voltage */
>   			regulator-min-microvolt = <2952000>;
>   			regulator-max-microvolt = <2952000>;
> @@ -282,66 +290,77 @@ vreg_l7b: ldo7 {
>   		};
>   
>   		vreg_l8b: ldo8 {
> +			regulator-name = "vreg_l8b";
>   			regulator-min-microvolt = <870000>;
>   			regulator-max-microvolt = <970000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l9b: ldo9 {
> +			regulator-name = "vreg_l9b";
>   			regulator-min-microvolt = <1200000>;
>   			regulator-max-microvolt = <1304000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l11b: ldo11 {
> +			regulator-name = "vreg_l11b";
>   			regulator-min-microvolt = <1504000>;
>   			regulator-max-microvolt = <2000000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l12b: ldo12 {
> +			regulator-name = "vreg_l12b";
>   			regulator-min-microvolt = <751000>;
>   			regulator-max-microvolt = <824000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l13b: ldo13 {
> +			regulator-name = "vreg_l13b";
>   			regulator-min-microvolt = <530000>;
>   			regulator-max-microvolt = <824000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l14b: ldo14 {
> +			regulator-name = "vreg_l14b";
>   			regulator-min-microvolt = <1080000>;
>   			regulator-max-microvolt = <1304000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l15b: ldo15 {
> +			regulator-name = "vreg_l15b";
>   			regulator-min-microvolt = <765000>;
>   			regulator-max-microvolt = <1020000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l16b: ldo16 {
> +			regulator-name = "vreg_l16b";
>   			regulator-min-microvolt = <1100000>;
>   			regulator-max-microvolt = <1300000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l17b: ldo17 {
> +			regulator-name = "vreg_l17b";
>   			regulator-min-microvolt = <1700000>;
>   			regulator-max-microvolt = <1900000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l18b: ldo18 {
> +			regulator-name = "vreg_l18b";
>   			regulator-min-microvolt = <1800000>;
>   			regulator-max-microvolt = <2000000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l19b: ldo19 {
> +			regulator-name = "vreg_l19b";
>   			regulator-min-microvolt = <1800000>;
>   			regulator-max-microvolt = <2000000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
> @@ -353,96 +372,112 @@ regulators-1 {
>   		qcom,pmic-id = "c";
>   
>   		vreg_s1c: smps1 {
> +			regulator-name = "vreg_s1c";
>   			regulator-min-microvolt = <2190000>;
>   			regulator-max-microvolt = <2210000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_s9c: smps9 {
> +			regulator-name = "vreg_s9c";
>   			regulator-min-microvolt = <1010000>;
>   			regulator-max-microvolt = <1170000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l1c: ldo1 {
> +			regulator-name = "vreg_l1c";
>   			regulator-min-microvolt = <1800000>;
>   			regulator-max-microvolt = <1980000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l2c: ldo2 {
> +			regulator-name = "vreg_l2c";
>   			regulator-min-microvolt = <1800000>;
>   			regulator-max-microvolt = <1950000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l3c: ldo3 {
> +			regulator-name = "vreg_l3c";
>   			regulator-min-microvolt = <3000000>;
>   			regulator-max-microvolt = <3400000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l4c: ldo4 {
> +			regulator-name = "vreg_l4c";
>   			regulator-min-microvolt = <1620000>;
>   			regulator-max-microvolt = <3300000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l5c: ldo5 {
> +			regulator-name = "vreg_l5c";
>   			regulator-min-microvolt = <1620000>;
>   			regulator-max-microvolt = <3300000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l6c: ldo6 {
> +			regulator-name = "vreg_l6c";
>   			regulator-min-microvolt = <1650000>;
>   			regulator-max-microvolt = <3544000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l7c: ldo7 {
> +			regulator-name = "vreg_l7c";
>   			regulator-min-microvolt = <3000000>;
>   			regulator-max-microvolt = <3544000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l8c: ldo8 {
> +			regulator-name = "vreg_l8c";
>   			regulator-min-microvolt = <1620000>;
>   			regulator-max-microvolt = <2000000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l9c: ldo9 {
> +			regulator-name = "vreg_l9c";
>   			regulator-min-microvolt = <2700000>;
>   			regulator-max-microvolt = <3544000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l10c: ldo10 {
> +			regulator-name = "vreg_l10c";
>   			regulator-min-microvolt = <720000>;
>   			regulator-max-microvolt = <1050000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l11c: ldo11 {
> +			regulator-name = "vreg_l11c";
>   			regulator-min-microvolt = <2800000>;
>   			regulator-max-microvolt = <3544000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l12c: ldo12 {
> +			regulator-name = "vreg_l12c";
>   			regulator-min-microvolt = <1650000>;
>   			regulator-max-microvolt = <2000000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_l13c: ldo13 {
> +			regulator-name = "vreg_l13c";
>   			regulator-min-microvolt = <2700000>;
>   			regulator-max-microvolt = <3544000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
>   		};
>   
>   		vreg_bob: bob {
> +			regulator-name = "vreg_bob";
>   			regulator-min-microvolt = <3008000>;
>   			regulator-max-microvolt = <3960000>;
>   			regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>;
>

Re: [PATCH 2/2] arm64: dts: qcom: qcm6490-shift-otter: Name the regulators

Posted by Konrad Dybcio 1 year, 7 months ago


On 6/18/24 15:30, Luca Weiss wrote:
> Without explicitly specifying names for the regulators they are named
> based on the DeviceTree node name. This results in multiple regulators
> with the same name, making debug prints and regulator_summary impossible
> to reason about.
> 
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad

[PATCH 1/2] arm64: dts: qcom: qcm6490-fairphone-fp5: Name the regulators
[PATCH 2/2] arm64: dts: qcom: qcm6490-shift-otter: Name the regulators