[PATCH v2 1/2] ARM: dts: msm8974: castor: Define pm8841 regulators

[PATCH v2 1/2] ARM: dts: msm8974: castor: Define pm8841 regulators

[Luca Weiss]

From: Bjorn Andersson <bjorn.andersson@linaro.org>

Define the pm8841 regulators under SMD/RPM, to allow the modem
remoteproc to set the voltage during boot of the remote processor.

Entries are just copied from the Honami dts.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
Changes in v2:
* new patch in this series

 ...-msm8974pro-sony-xperia-shinano-castor.dts | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index 3f45f5c5d37b..2c33f84a6e4e 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -319,6 +319,30 @@ led@7 {
 };
 
 &rpm_requests {
+	pm8841-regulators {
+		compatible = "qcom,rpm-pm8841-regulators";
+
+		pm8841_s1: s1 {
+			regulator-min-microvolt = <675000>;
+			regulator-max-microvolt = <1050000>;
+		};
+
+		pm8841_s2: s2 {
+			regulator-min-microvolt = <500000>;
+			regulator-max-microvolt = <1050000>;
+		};
+
+		pm8841_s3: s3 {
+			regulator-min-microvolt = <500000>;
+			regulator-max-microvolt = <1050000>;
+		};
+
+		pm8841_s4: s4 {
+			regulator-min-microvolt = <500000>;
+			regulator-max-microvolt = <1050000>;
+		};
+	};
+
 	pm8941-regulators {
 		compatible = "qcom,rpm-pm8941-regulators";
 
-- 
2.38.1

[PATCH v2 2/2] ARM: dts: qcom: msm8974-*: re-add remoteproc supplies

[Luca Weiss]

As part of a recent cleanup commit, the remoteproc supplies for adsp and
modem were removed from msm8974.dtsi and now need to be set in the
device dts. Do so.

Fixes: f300826d27be ("ARM: dts: qcom-msm8974: Sort and clean up nodes")
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
Changes in v2:
* rebase, should compile now due to added previous patch

 .../boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts   | 11 +++++++++++
 arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 11 +++++++++++
 .../qcom-msm8974pro-sony-xperia-shinano-castor.dts    | 11 +++++++++++
 3 files changed, 33 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
index 6daceaa87802..c8e91985fbec 100644
--- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -343,6 +343,17 @@ led@5 {
 	};
 };
 
+&remoteproc_adsp {
+	cx-supply = <&pm8841_s2>;
+};
+
+&remoteproc_mss {
+	cx-supply = <&pm8841_s2>;
+	mss-supply = <&pm8841_s3>;
+	mx-supply = <&pm8841_s1>;
+	pll-supply = <&pm8941_l12>;
+};
+
 &rpm_requests {
 	pm8841-regulators {
 		compatible = "qcom,rpm-pm8841-regulators";
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
index 5a70683d9103..d4a1708117a1 100644
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -213,6 +213,17 @@ &pm8941_wled {
 	qcom,num-strings = <2>;
 };
 
+&remoteproc_adsp {
+	cx-supply = <&pm8841_s2>;
+};
+
+&remoteproc_mss {
+	cx-supply = <&pm8841_s2>;
+	mss-supply = <&pm8841_s3>;
+	mx-supply = <&pm8841_s1>;
+	pll-supply = <&pm8941_l12>;
+};
+
 &rpm_requests {
 	pm8841-regulators {
 		compatible = "qcom,rpm-pm8841-regulators";
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index 2c33f84a6e4e..36044130a739 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -318,6 +318,17 @@ led@7 {
 	};
 };
 
+&remoteproc_adsp {
+	cx-supply = <&pm8841_s2>;
+};
+
+&remoteproc_mss {
+	cx-supply = <&pm8841_s2>;
+	mss-supply = <&pm8841_s3>;
+	mx-supply = <&pm8841_s1>;
+	pll-supply = <&pm8941_l12>;
+};
+
 &rpm_requests {
 	pm8841-regulators {
 		compatible = "qcom,rpm-pm8841-regulators";
-- 
2.38.1

Re: [PATCH v2 1/2] ARM: dts: msm8974: castor: Define pm8841 regulators

[Konrad Dybcio]

On 21.11.2022 22:22, Luca Weiss wrote:
> From: Bjorn Andersson <bjorn.andersson@linaro.org>
> 
> Define the pm8841 regulators under SMD/RPM, to allow the modem
> remoteproc to set the voltage during boot of the remote processor.
> 
> Entries are just copied from the Honami dts.
I hope it was supposed to be "identical to" and not "copied and hoped it
would be ok" :/

Maybe I'm a bit picky, but I suppose this is said in a misleading way..

Konrad
> 
> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
> Changes in v2:
> * new patch in this series
> 
>  ...-msm8974pro-sony-xperia-shinano-castor.dts | 24 +++++++++++++++++++
>  1 file changed, 24 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> index 3f45f5c5d37b..2c33f84a6e4e 100644
> --- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> +++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> @@ -319,6 +319,30 @@ led@7 {
>  };
>  
>  &rpm_requests {
> +	pm8841-regulators {
> +		compatible = "qcom,rpm-pm8841-regulators";
> +
> +		pm8841_s1: s1 {
> +			regulator-min-microvolt = <675000>;
> +			regulator-max-microvolt = <1050000>;
> +		};
> +
> +		pm8841_s2: s2 {
> +			regulator-min-microvolt = <500000>;
> +			regulator-max-microvolt = <1050000>;
> +		};
> +
> +		pm8841_s3: s3 {
> +			regulator-min-microvolt = <500000>;
> +			regulator-max-microvolt = <1050000>;
> +		};
> +
> +		pm8841_s4: s4 {
> +			regulator-min-microvolt = <500000>;
> +			regulator-max-microvolt = <1050000>;
> +		};
> +	};
> +
>  	pm8941-regulators {
>  		compatible = "qcom,rpm-pm8941-regulators";
>  

Re: [PATCH v2 1/2] ARM: dts: msm8974: castor: Define pm8841 regulators

[Luca Weiss]

On Montag, 21. November 2022 23:32:22 CET Konrad Dybcio wrote:
> On 21.11.2022 22:22, Luca Weiss wrote:
> > From: Bjorn Andersson <bjorn.andersson@linaro.org>
> > 
> > Define the pm8841 regulators under SMD/RPM, to allow the modem
> > remoteproc to set the voltage during boot of the remote processor.
> > 
> > Entries are just copied from the Honami dts.
> 
> I hope it was supposed to be "identical to" and not "copied and hoped it
> would be ok" :/

Blame Bjorn from many years ago :P

But I just double checked and in some Sony msm8974 kernel sources I have on my 
computer (https://github.com/rcstar6696/android_kernel_sony_msm8974 branch 
cm-14.1) all Sony devices have the same values these pm8841 regulators, none 
have it overriden from what I could find. So should be fine.

Regards
Luca

> 
> Maybe I'm a bit picky, but I suppose this is said in a misleading way..
> 
> Konrad
> 
> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> > ---
> > Changes in v2:
> > * new patch in this series
> > 
> >  ...-msm8974pro-sony-xperia-shinano-castor.dts | 24 +++++++++++++++++++
> >  1 file changed, 24 insertions(+)
> > 
> > diff --git
> > a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> > b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts index
> > 3f45f5c5d37b..2c33f84a6e4e 100644
> > --- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> > +++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> > @@ -319,6 +319,30 @@ led@7 {
> > 
> >  };
> >  
> >  &rpm_requests {
> > 
> > +	pm8841-regulators {
> > +		compatible = "qcom,rpm-pm8841-regulators";
> > +
> > +		pm8841_s1: s1 {
> > +			regulator-min-microvolt = <675000>;
> > +			regulator-max-microvolt = <1050000>;
> > +		};
> > +
> > +		pm8841_s2: s2 {
> > +			regulator-min-microvolt = <500000>;
> > +			regulator-max-microvolt = <1050000>;
> > +		};
> > +
> > +		pm8841_s3: s3 {
> > +			regulator-min-microvolt = <500000>;
> > +			regulator-max-microvolt = <1050000>;
> > +		};
> > +
> > +		pm8841_s4: s4 {
> > +			regulator-min-microvolt = <500000>;
> > +			regulator-max-microvolt = <1050000>;
> > +		};
> > +	};
> > +
> > 
> >  	pm8941-regulators {
> >  	
> >  		compatible = "qcom,rpm-pm8941-regulators";

Re: (subset) [PATCH v2 1/2] ARM: dts: msm8974: castor: Define pm8841 regulators

[Bjorn Andersson]

On Mon, 21 Nov 2022 22:22:25 +0100, Luca Weiss wrote:
> From: Bjorn Andersson <bjorn.andersson@linaro.org>
> 
> Define the pm8841 regulators under SMD/RPM, to allow the modem
> remoteproc to set the voltage during boot of the remote processor.
> 
> Entries are just copied from the Honami dts.
> 
> [...]

Applied, thanks!

[1/2] ARM: dts: msm8974: castor: Define pm8841 regulators
      commit: a0145c557d94b3bac7c5a4545f90cfe940a226cd
[2/2] ARM: dts: qcom: msm8974-*: re-add remoteproc supplies
      commit: 6d933c0ec1718a08b44689da0f79ac1d905db7dd

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>