Commit f300826d authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files

ARM: dts: qcom-msm8974: Sort and clean up nodes 



- Remove regulators from the SoC DTSI
- cpu_pmu{} -> pmu{}
- move modem/iris regulators out of here; only FP2 used them
- tcsr_mutex is moved out of /soc

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
[bjorn: Rebased on top of Krzysztof's fixes]
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220415115633.575010-18-konrad.dybcio@somainline.org
parent 2daa7858

arch/arm/boot/dts/qcom-apq8074-dragonboard.dts

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ 


&rpm_requests {

	pm8841-regulators {

		compatible = "qcom,rpm-pm8841-regulators";



		pm8841_s1: s1 {

			regulator-min-microvolt = <675000>;

			regulator-max-microvolt = <1050000>;
@@ -83,6 +85,8 @@ 
	};



	pm8941-regulators {

		compatible = "qcom,rpm-pm8941-regulators";



		vdd_l1_l3-supply = <&pm8941_s1>;

		vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;

		vdd_l4_l11-supply = <&pm8941_s1>;

arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts

+12 −0
Original line number Diff line number Diff line
@@ -109,10 +109,18 @@ 


	vddmx-supply = <&pm8841_s1>;

	vddcx-supply = <&pm8841_s2>;

	vddpx-supply = <&pm8941_s3>;



	pinctrl-names = "default";

	pinctrl-0 = <&wcnss_pin_a>;



	iris {

		vddxo-supply = <&pm8941_l6>;

		vddrfa-supply = <&pm8941_l11>;

		vddpa-supply = <&pm8941_l19>;

		vdddig-supply = <&pm8941_s3>;

	};



	smd-edge {

		qcom,remote-pid = <4>;

		label = "pronto";
@@ -125,6 +133,8 @@ 


&rpm_requests {

	pm8841-regulators {

		compatible = "qcom,rpm-pm8841-regulators";



		pm8841_s1: s1 {

			regulator-min-microvolt = <675000>;

			regulator-max-microvolt = <1050000>;
@@ -142,6 +152,8 @@ 
	};



	pm8941-regulators {

		compatible = "qcom,rpm-pm8941-regulators";



		vdd_l1_l3-supply = <&pm8941_s1>;

		vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;

		vdd_l4_l11-supply = <&pm8941_s1>;

arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts

+7 −0
Original line number Diff line number Diff line
@@ -334,6 +334,8 @@ 


&rpm_requests {

	pm8841-regulators {

		compatible = "qcom,rpm-pm8841-regulators";



		pm8841_s1: s1 {

			regulator-min-microvolt = <675000>;

			regulator-max-microvolt = <1050000>;
@@ -356,6 +358,8 @@ 
	};



	pm8941-regulators {

		compatible = "qcom,rpm-pm8941-regulators";



		vdd_l1_l3-supply = <&pm8941_s1>;

		vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;

		vdd_l4_l11-supply = <&pm8941_s1>;
@@ -517,6 +521,9 @@ 
			regulator-max-microvolt = <3075000>;

			regulator-boot-on;

		};



		pm8941_lvs1: lvs1 {};

		pm8941_lvs3: lvs3 {};

	};

};

arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ 


&rpm_requests {

	pm8841-regulators {

		compatible = "qcom,rpm-pm8841-regulators";



		pm8841_s1: s1 {

			regulator-min-microvolt = <675000>;

			regulator-max-microvolt = <1050000>;
@@ -175,6 +177,8 @@ 
	};



	pm8941-regulators {

		compatible = "qcom,rpm-pm8941-regulators";



		vdd_l1_l3-supply = <&pm8941_s1>;

		vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;

		vdd_l4_l11-supply = <&pm8941_s1>;
@@ -335,6 +339,8 @@ 
			regulator-max-microvolt = <3075000>;

			regulator-boot-on;

		};



		pm8941_lvs3: lvs3 {};

	};

};

arch/arm/boot/dts/qcom-msm8974.dtsi

+677 −739

File changed.

Preview size limit exceeded, changes collapsed.