2023-07-11 11:28:59

by Konrad Dybcio

[permalink] [raw]
Subject: [PATCH] arm64: dts: qcom: qrb2210-rb1: Add regulators

Add and assign RPM regulators coming from PM2250.

Signed-off-by: Konrad Dybcio <[email protected]>
---
arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 266 +++++++++++++++++++++++++++++++
1 file changed, 266 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
index ef3616093289..eadba066972e 100644
--- a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
+++ b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
@@ -38,6 +38,91 @@ key-volume-up {
wakeup-source;
};
};
+
+ vreg_hdmi_out_1p2: regulator-hdmi-out-1p2 {
+ compatible = "regulator-fixed";
+ regulator-name = "VREG_HDMI_OUT_1P2";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ vin-supply = <&vdc_1v2>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ lt9611_3v3: regulator-lt9611-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "LT9611_3V3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&vdc_3v3>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ /* Main barrel jack input */
+ vdc_12v: regulator-vdc-12v {
+ compatible = "regulator-fixed";
+ regulator-name = "DC_12V";
+ regulator-min-microvolt = <12000000>;
+ regulator-max-microvolt = <12000000>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ /* 1.2V supply stepped down from the barrel jack input */
+ vdc_1v2: regulator-vdc-1v2 {
+ compatible = "regulator-fixed";
+ regulator-name = "VDC_1V2";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ vin-supply = <&vdc_12v>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ /* 3.3V supply stepped down from the barrel jack input */
+ vdc_3v3: regulator-vdc-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "VDC_3V3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ vin-supply = <&vdc_12v>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ /* 5V supply stepped down from the barrel jack input */
+ vdc_5v: regulator-vdc-5v {
+ compatible = "regulator-fixed";
+ regulator-name = "VDC_5V";
+
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ /* "Battery" voltage for the SoM, stepped down from the barrel jack input */
+ vdc_vbat_som: regulator-vdc-vbat {
+ compatible = "regulator-fixed";
+ regulator-name = "VBAT_SOM";
+ regulator-min-microvolt = <4200000>;
+ regulator-max-microvolt = <4200000>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ /* PM2250 charger out, supplied by VBAT */
+ vph_pwr: regulator-vph-pwr {
+ compatible = "regulator-fixed";
+ regulator-name = "vph_pwr";
+ regulator-min-microvolt = <3700000>;
+ regulator-max-microvolt = <3700000>;
+ vin-supply = <&vdc_vbat_som>;
+
+ regulator-always-on;
+ regulator-boot-on;
+ };
};

&pm2250_resin {
@@ -49,7 +134,183 @@ &qupv3_id_0 {
status = "okay";
};

+&rpm_requests {
+ regulators {
+ compatible = "qcom,rpm-pm2250-regulators";
+ vdd_s3-supply = <&vph_pwr>;
+ vdd_s4-supply = <&vph_pwr>;
+ vdd_l1_l2_l3_l5_l6_l7_l8_l9_l10_l11_l12-supply = <&pm2250_s3>;
+ vdd_l4_l17_l18_l19_l20_l21_l22-supply = <&vph_pwr>;
+ vdd_l13_l14_l15_l16-supply = <&pm2250_s4>;
+
+ /*
+ * S1 - VDD_APC
+ * S2 - VDD_CX
+ */
+
+ pm2250_s3: s3 {
+ /* 0.4V-1.6625V -> 1.3V (Power tree requirements) */
+ regulator-min-microvolts = <1350000>;
+ regulator-max-microvolts = <1350000>;
+ regulator-boot-on;
+ };
+
+ pm2250_s4: s4 {
+ /* 1.2V-2.35V -> 2.05V (Power tree requirements) */
+ regulator-min-microvolts = <2072000>;
+ regulator-max-microvolts = <2072000>;
+ regulator-boot-on;
+ };
+
+ /* L1 - VDD_MX */
+
+ pm2250_l2: l2 {
+ /* LPDDR4X VDD2 */
+ regulator-min-microvolts = <1136000>;
+ regulator-max-microvolts = <1136000>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ pm2250_l3: l3 {
+ /* LPDDR4X VDDQ */
+ regulator-min-microvolts = <616000>;
+ regulator-max-microvolts = <616000>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ pm2250_l4: l4 {
+ /* max = 3.05V -> max = just below 3V (SDHCI2) */
+ regulator-min-microvolts = <1648000>;
+ regulator-max-microvolts = <2992000>;
+ regulator-allow-set-load;
+ };
+
+ pm2250_l5: l5 {
+ /* CSI/DSI */
+ regulator-min-microvolts = <1232000>;
+ regulator-max-microvolts = <1232000>;
+ regulator-allow-set-load;
+ regulator-boot-on;
+ };
+
+ pm2250_l6: l6 {
+ /* DRAM PLL */
+ regulator-min-microvolts = <928000>;
+ regulator-max-microvolts = <928000>;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ pm2250_l7: l7 {
+ /* Wi-Fi CX/MX */
+ regulator-min-microvolts = <664000>;
+ regulator-max-microvolts = <664000>;
+ };
+
+ /*
+ * L8 - VDD_LPI_CX
+ * L9 - VDD_LPI_MX
+ */
+
+ pm2250_l10: l10 {
+ /* Wi-Fi RFA */
+ regulator-min-microvolts = <1300000>;
+ regulator-max-microvolts = <1300000>;
+ };
+
+ pm2250_l11: l11 {
+ /* GPS RF1 */
+ regulator-min-microvolts = <1000000>;
+ regulator-max-microvolts = <1000000>;
+ regulator-boot-on;
+ };
+
+ pm2250_l12: l12 {
+ /* USB PHYs */
+ regulator-min-microvolts = <928000>;
+ regulator-max-microvolts = <928000>;
+ regulator-allow-set-load;
+ regulator-boot-on;
+ };
+
+ pm2250_l13: l13 {
+ /* USB/QFPROM/PLLs */
+ regulator-min-microvolts = <1800000>;
+ regulator-max-microvolts = <1800000>;
+ regulator-allow-set-load;
+ regulator-boot-on;
+ };
+
+ pm2250_l14: l14 {
+ /* SDHCI1 VQMMC */
+ regulator-min-microvolts = <1800000>;
+ regulator-max-microvolts = <1800000>;
+ regulator-allow-set-load;
+ /* Broken hardware, never turn it off! */
+ regulator-always-on;
+ };
+
+ pm2250_l15: l15 {
+ /* WCD/DSI/BT VDDIO */
+ regulator-min-microvolts = <1800000>;
+ regulator-max-microvolts = <1800000>;
+ regulator-allow-set-load;
+ regulator-always-on;
+ regulator-boot-on;
+ };
+
+ pm2250_l16: l16 {
+ /* GPS RF2 */
+ regulator-min-microvolts = <1800000>;
+ regulator-max-microvolts = <1800000>;
+ regulator-boot-on;
+ };
+
+ pm2250_l17: l17 {
+ regulator-min-microvolts = <3000000>;
+ regulator-max-microvolts = <3000000>;
+ };
+
+ pm2250_l18: l18 {
+ /* VDD_PXn */
+ regulator-min-microvolts = <1800000>;
+ regulator-max-microvolts = <1800000>;
+ };
+
+ pm2250_l19: l19 {
+ /* VDD_PXn */
+ regulator-min-microvolts = <1800000>;
+ regulator-max-microvolts = <1800000>;
+ };
+
+ pm2250_l20: l20 {
+ /* SDHCI1 VMMC */
+ regulator-min-microvolts = <2856000>;
+ regulator-max-microvolts = <2856000>;
+ regulator-allow-set-load;
+ };
+
+ pm2250_l21: l21 {
+ /* SDHCI2 VMMC */
+ regulator-min-microvolts = <2960000>;
+ regulator-max-microvolts = <3300000>;
+ regulator-allow-set-load;
+ regulator-boot-on;
+ };
+
+ pm2250_l22: l22 {
+ /* Wi-Fi */
+ regulator-min-microvolts = <3312000>;
+ regulator-max-microvolts = <3312000>;
+ };
+ };
+};
+
&sdhc_1 {
+ vmmc-supply = <&pm2250_l20>;
+ vqmmc-supply = <&pm2250_l14>;
pinctrl-0 = <&sdc1_state_on>;
pinctrl-1 = <&sdc1_state_off>;
pinctrl-names = "default", "sleep";
@@ -61,6 +322,8 @@ &sdhc_1 {
};

&sdhc_2 {
+ vmmc-supply = <&pm2250_l21>;
+ vqmmc-supply = <&pm2250_l4>;
cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&sdc2_state_on &sd_det_in_on>;
pinctrl-1 = <&sdc2_state_off &sd_det_in_off>;
@@ -104,6 +367,9 @@ &usb {
};

&usb_hsphy {
+ vdd-supply = <&pm2250_l12>;
+ vdda-pll-supply = <&pm2250_l13>;
+ vdda-phy-dpdm-supply = <&pm2250_l21>;
status = "okay";
};


---
base-commit: 8e4b7f2f3d6071665b1dfd70786229c8a5d6c256
change-id: 20230711-topic-rb1_regulator-44c4ade93246

Best regards,
--
Konrad Dybcio <[email protected]>



2023-07-11 11:53:31

by Dmitry Baryshkov

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: qrb2210-rb1: Add regulators

On Tue, 11 Jul 2023 at 14:41, Konrad Dybcio <[email protected]> wrote:
>
> On 11.07.2023 12:56, Dmitry Baryshkov wrote:
> > On Tue, 11 Jul 2023 at 13:48, Konrad Dybcio <[email protected]> wrote:
> >>
> >> On 11.07.2023 12:44, Dmitry Baryshkov wrote:
> >>> On Tue, 11 Jul 2023 at 13:28, Konrad Dybcio <[email protected]> wrote:
> >>>>
> >>>> Add and assign RPM regulators coming from PM2250.
> >>>>
> >>>> Signed-off-by: Konrad Dybcio <[email protected]>
> >>>> ---
> >> [...]
> >>
> >>>> + pm2250_l5: l5 {
> >>>> + /* CSI/DSI */
> >>>> + regulator-min-microvolts = <1232000>;
> >>>> + regulator-max-microvolts = <1232000>;
> >>>> + regulator-allow-set-load;
> >>>> + regulator-boot-on;
> >>>
> >>> why?
> >>>
> >> To answer all of the questions in one go:
> >>
> >> "it's because the regulator is enabled at boot"
> >
> > I was more concerned about the following part:
> > If the bootloader didn't leave it on then OS should turn it on at boot ...
> >
> > Please remind me, are we declaring them as boot-on so that the
> > regulator core can turn them off later if they are unused?
> In the Linux implementation, yes.

Ack.

Reviewed-by: Dmitry Baryshkov <[email protected]>

>
> Konrad
> >
> >>
> >> Konrad
> >>>> + };
> >>>> +
> >>>> + pm2250_l6: l6 {
> >>>> + /* DRAM PLL */
> >>>> + regulator-min-microvolts = <928000>;
> >>>> + regulator-max-microvolts = <928000>;
> >>>> + regulator-always-on;
> >>>> + regulator-boot-on;
> >>>> + };
> >>>> +
> >>>> + pm2250_l7: l7 {
> >>>> + /* Wi-Fi CX/MX */
> >>>> + regulator-min-microvolts = <664000>;
> >>>> + regulator-max-microvolts = <664000>;
> >>>> + };
> >>>> +
> >>>> + /*
> >>>> + * L8 - VDD_LPI_CX
> >>>> + * L9 - VDD_LPI_MX
> >>>> + */
> >>>> +
> >>>> + pm2250_l10: l10 {
> >>>> + /* Wi-Fi RFA */
> >>>> + regulator-min-microvolts = <1300000>;
> >>>> + regulator-max-microvolts = <1300000>;
> >>>> + };
> >>>> +
> >>>> + pm2250_l11: l11 {
> >>>> + /* GPS RF1 */
> >>>> + regulator-min-microvolts = <1000000>;
> >>>> + regulator-max-microvolts = <1000000>;
> >>>> + regulator-boot-on;
> >>>
> >>> Shouldn't it be handled by the modem on its own?
> >>>
> >>>> + };
> >>>> +
> >>>> + pm2250_l12: l12 {
> >>>> + /* USB PHYs */
> >>>> + regulator-min-microvolts = <928000>;
> >>>> + regulator-max-microvolts = <928000>;
> >>>> + regulator-allow-set-load;
> >>>> + regulator-boot-on;
> >>>
> >>> You guess the question (and further on)
> >>>
> >>>> + };
> >>>> +
> >>>> + pm2250_l13: l13 {
> >>>> + /* USB/QFPROM/PLLs */
> >>>> + regulator-min-microvolts = <1800000>;
> >>>> + regulator-max-microvolts = <1800000>;
> >>>> + regulator-allow-set-load;
> >>>> + regulator-boot-on;
> >>>> + };
> >>>> +
> >>>> + pm2250_l14: l14 {
> >>>> + /* SDHCI1 VQMMC */
> >>>> + regulator-min-microvolts = <1800000>;
> >>>> + regulator-max-microvolts = <1800000>;
> >>>> + regulator-allow-set-load;
> >>>> + /* Broken hardware, never turn it off! */
> >>>> + regulator-always-on;
> >>>> + };
> >>>> +
> >>>> + pm2250_l15: l15 {
> >>>> + /* WCD/DSI/BT VDDIO */
> >>>> + regulator-min-microvolts = <1800000>;
> >>>> + regulator-max-microvolts = <1800000>;
> >>>> + regulator-allow-set-load;
> >>>> + regulator-always-on;
> >>>> + regulator-boot-on;
> >>>> + };
> >>>> +
> >>>> + pm2250_l16: l16 {
> >>>> + /* GPS RF2 */
> >>>> + regulator-min-microvolts = <1800000>;
> >>>> + regulator-max-microvolts = <1800000>;
> >>>> + regulator-boot-on;
> >>>> + };
> >>>> +
> >>>> + pm2250_l17: l17 {
> >>>> + regulator-min-microvolts = <3000000>;
> >>>> + regulator-max-microvolts = <3000000>;
> >>>> + };
> >>>> +
> >>>> + pm2250_l18: l18 {
> >>>> + /* VDD_PXn */
> >>>> + regulator-min-microvolts = <1800000>;
> >>>> + regulator-max-microvolts = <1800000>;
> >>>> + };
> >>>> +
> >>>> + pm2250_l19: l19 {
> >>>> + /* VDD_PXn */
> >>>> + regulator-min-microvolts = <1800000>;
> >>>> + regulator-max-microvolts = <1800000>;
> >>>> + };
> >>>> +
> >>>> + pm2250_l20: l20 {
> >>>> + /* SDHCI1 VMMC */
> >>>> + regulator-min-microvolts = <2856000>;
> >>>> + regulator-max-microvolts = <2856000>;
> >>>> + regulator-allow-set-load;
> >>>> + };
> >>>> +
> >>>> + pm2250_l21: l21 {
> >>>> + /* SDHCI2 VMMC */
> >>>> + regulator-min-microvolts = <2960000>;
> >>>> + regulator-max-microvolts = <3300000>;
> >>>> + regulator-allow-set-load;
> >>>> + regulator-boot-on;
> >>>> + };
> >>>> +
> >>>> + pm2250_l22: l22 {
> >>>> + /* Wi-Fi */
> >>>> + regulator-min-microvolts = <3312000>;
> >>>> + regulator-max-microvolts = <3312000>;
> >>>> + };
> >>>> + };
> >>>> +};
> >>>> +
> >>>> &sdhc_1 {
> >>>> + vmmc-supply = <&pm2250_l20>;
> >>>> + vqmmc-supply = <&pm2250_l14>;
> >>>> pinctrl-0 = <&sdc1_state_on>;
> >>>> pinctrl-1 = <&sdc1_state_off>;
> >>>> pinctrl-names = "default", "sleep";
> >>>> @@ -61,6 +322,8 @@ &sdhc_1 {
> >>>> };
> >>>>
> >>>> &sdhc_2 {
> >>>> + vmmc-supply = <&pm2250_l21>;
> >>>> + vqmmc-supply = <&pm2250_l4>;
> >>>> cd-gpios = <&tlmm 88 GPIO_ACTIVE_LOW>;
> >>>> pinctrl-0 = <&sdc2_state_on &sd_det_in_on>;
> >>>> pinctrl-1 = <&sdc2_state_off &sd_det_in_off>;
> >>>> @@ -104,6 +367,9 @@ &usb {
> >>>> };
> >>>>
> >>>> &usb_hsphy {
> >>>> + vdd-supply = <&pm2250_l12>;
> >>>> + vdda-pll-supply = <&pm2250_l13>;
> >>>> + vdda-phy-dpdm-supply = <&pm2250_l21>;
> >>>> status = "okay";
> >>>> };
> >>>>
> >>>>
> >>>> ---
> >>>> base-commit: 8e4b7f2f3d6071665b1dfd70786229c8a5d6c256
> >>>> change-id: 20230711-topic-rb1_regulator-44c4ade93246
> >>>>
> >>>> Best regards,
> >>>> --
> >>>> Konrad Dybcio <[email protected]>
> >>>>
> >>>
> >>>
> >
> >
> >



--
With best wishes
Dmitry

2023-07-14 05:33:11

by Bjorn Andersson

[permalink] [raw]
Subject: Re: [PATCH] arm64: dts: qcom: qrb2210-rb1: Add regulators


On Tue, 11 Jul 2023 12:28:17 +0200, Konrad Dybcio wrote:
> Add and assign RPM regulators coming from PM2250.
>
>

Applied, thanks!

[1/1] arm64: dts: qcom: qrb2210-rb1: Add regulators
commit: b4fe47d12f1f8ee82ab18803d1ab074ff3d4b368

Best regards,
--
Bjorn Andersson <[email protected]>