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

arm64: dts: qcom: Move msm8994-smd-rpm contents to lg-bullhead. 



This was the only device using that dtsi, so no point
keeping it separate AND with a confusing name (bullhead
is based on msm8992 and the file contains regulator
values for that specific board).

Signed-off-by: default avatarKonrad Dybcio <konradybcio@gmail.com>
Link: https://lore.kernel.org/r/20200624150107.76234-8-konradybcio@gmail.com


[bjorn: Squashed with change that remove regulators from msm8992.dtsi]
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 01104518

arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts

+224 −1
Original line number Diff line number Diff line
@@ -47,4 +47,227 @@ 
	};

};



#include "msm8994-smd-rpm.dtsi"
 
&rpm_requests {

	pm8994-regulators {

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



		vdd_l1-supply = <&pm8994_s1>;

		vdd_l2_26_28-supply = <&pm8994_s3>;

		vdd_l3_11-supply = <&pm8994_s3>;

		vdd_l4_27_31-supply = <&pm8994_s3>;

		vdd_l5_7-supply = <&pm8994_s3>;

		vdd_l6_12_32-supply = <&pm8994_s5>;

		vdd_l8_16_30-supply = <&vreg_vph_pwr>;

		vdd_l9_10_18_22-supply = <&vreg_vph_pwr>;

		vdd_l13_19_23_24-supply = <&vreg_vph_pwr>;

		vdd_l14_15-supply = <&pm8994_s5>;

		vdd_l17_29-supply = <&vreg_vph_pwr>;

		vdd_l20_21-supply = <&vreg_vph_pwr>;

		vdd_l25-supply = <&pm8994_s5>;

		vdd_lvs1_2 = <&pm8994_s4>;



		pm8994_s1: s1 {

			regulator-min-microvolt = <800000>;

			regulator-max-microvolt = <800000>;

		};



		pm8994_s2: s2 {

			/* TODO */

		};



		pm8994_s3: s3 {

			regulator-min-microvolt = <1300000>;

			regulator-max-microvolt = <1300000>;

		};



		pm8994_s4: s4 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-allow-set-load;

			regulator-system-load = <325000>;

		};



		pm8994_s5: s5 {

			regulator-min-microvolt = <2150000>;

			regulator-max-microvolt = <2150000>;

		};



		pm8994_s7: s7 {

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

		};



		pm8994_l1: l1 {

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

		};



		pm8994_l2: l2 {

			regulator-min-microvolt = <1250000>;

			regulator-max-microvolt = <1250000>;

		};



		pm8994_l3: l3 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

		};



		pm8994_l4: l4 {

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;

		};



		pm8994_l5: l5 {

			/* TODO */

		};



		pm8994_l6: l6 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		pm8994_l7: l7 {

			/* TODO */

		};



		pm8994_l8: l8 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		pm8994_l9: l9 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		pm8994_l10: l10 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		pm8994_l11: l11 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

		};



		pm8994_l12: l12 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		pm8994_l13: l13 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2950000>;

		};



		pm8994_l14: l14 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

		};



		pm8994_l15: l15 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		pm8994_l16: l16 {

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <2700000>;

		};



		pm8994_l17: l17 {

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <2700000>;

		};



		pm8994_l18: l18 {

			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3000000>;

		};



		pm8994_l19: l19 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		pm8994_l20: l20 {

			regulator-min-microvolt = <2950000>;

			regulator-max-microvolt = <2950000>;

			regulator-always-on;

			regulator-boot-on;

			regulator-allow-set-load;

			regulator-system-load = <570000>;

		};



		pm8994_l21: l21 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-always-on;

		};



		pm8994_l22: l22 {

			regulator-min-microvolt = <3100000>;

			regulator-max-microvolt = <3100000>;

		};



		pm8994_l23: l23 {

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

		};



		pm8994_l24: l24 {

			regulator-min-microvolt = <3075000>;

			regulator-max-microvolt = <3150000>;

		};



		pm8994_l25: l25 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

		};



		pm8994_l26: l26 {

			/* TODO: value from downstream

			regulator-min-microvolt = <987500>;

			fails to apply */

		};



		pm8994_l27: l27 {

			regulator-min-microvolt = <1050000>;

			regulator-max-microvolt = <1050000>;

		};



		pm8994_l28: l28 {

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

		};



		pm8994_l29: l29 {

			/* TODO: Unsupported voltage range.

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			qcom,init-voltage = <2800000>;

			*/

		};



		pm8994_l30: l30 {

			/* TODO: get this verified

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

			*/

		};



		pm8994_l31: l31 {

			regulator-min-microvolt = <1262500>;

			regulator-max-microvolt = <1262500>;

		};



		pm8994_l32: l32 {

			/* TODO: get this verified

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

			*/

		};

	};

};

arch/arm64/boot/dts/qcom/msm8992.dtsi

+0 −46
Original line number Diff line number Diff line
@@ -261,52 +261,6 @@ 
			rpm_requests: rpm-requests {

				compatible = "qcom,rpm-msm8994";

				qcom,smd-channels = "rpm_requests";



				pm8994-regulators {

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



					pm8994_s1: s1 {};

					pm8994_s2: s2 {};

					pm8994_s3: s3 {};

					pm8994_s4: s4 {};

					pm8994_s5: s5 {};

					pm8994_s6: s6 {};

					pm8994_s7: s7 {};



					pm8994_l1: l1 {};

					pm8994_l2: l2 {};

					pm8994_l3: l3 {};

					pm8994_l4: l4 {};

					pm8994_l6: l6 {};

					pm8994_l8: l8 {};

					pm8994_l9: l9 {};

					pm8994_l10: l10 {};

					pm8994_l11: l11 {};

					pm8994_l12: l12 {};

					pm8994_l13: l13 {};

					pm8994_l14: l14 {};

					pm8994_l15: l15 {};

					pm8994_l16: l16 {};

					pm8994_l17: l17 {};

					pm8994_l18: l18 {};

					pm8994_l19: l19 {};

					pm8994_l20: l20 {};

					pm8994_l21: l21 {};

					pm8994_l22: l22 {};

					pm8994_l23: l23 {};

					pm8994_l24: l24 {};

					pm8994_l25: l25 {};

					pm8994_l26: l26 {};

					pm8994_l27: l27 {};

					pm8994_l28: l28 {};

					pm8994_l29: l29 {};

					pm8994_l30: l30 {};

					pm8994_l31: l31 {};

					pm8994_l32: l32 {};



					pm8994_lvs1: lvs1 {};

					pm8994_lvs2: lvs2 {};

				};

			};

		};

	};

arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi

deleted100644 → 0
+0 −268
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2015, LGE Inc. All rights reserved.

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 */



&smd_rpm {

	rpm {

		rpm_requests {

			pm8994-regulators {



				vdd_l1-supply = <&pm8994_s1>;

				vdd_l2_26_28-supply = <&pm8994_s3>;

				vdd_l3_11-supply = <&pm8994_s3>;

				vdd_l4_27_31-supply = <&pm8994_s3>;

				vdd_l5_7-supply = <&pm8994_s3>;

				vdd_l6_12_32-supply = <&pm8994_s5>;

				vdd_l8_16_30-supply = <&vreg_vph_pwr>;

				vdd_l9_10_18_22-supply = <&vreg_vph_pwr>;

				vdd_l13_19_23_24-supply = <&vreg_vph_pwr>;

				vdd_l14_15-supply = <&pm8994_s5>;

				vdd_l17_29-supply = <&vreg_vph_pwr>;

				vdd_l20_21-supply = <&vreg_vph_pwr>;

				vdd_l25-supply = <&pm8994_s5>;

				vdd_lvs1_2 = <&pm8994_s4>;



				s1 {

					regulator-min-microvolt = <800000>;

					regulator-max-microvolt = <800000>;

				};



				s2 {

					/* TODO */

				};



				s3 {

					regulator-min-microvolt = <1300000>;

					regulator-max-microvolt = <1300000>;

				};



				s4 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-allow-set-load;

					regulator-system-load = <325000>;

				};



				s5 {

					regulator-min-microvolt = <2150000>;

					regulator-max-microvolt = <2150000>;

				};



				s7 {

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

				};



				l1 {

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

				};



				l2 {

					regulator-min-microvolt = <1250000>;

					regulator-max-microvolt = <1250000>;

				};



				l3 {

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

				};



				l4 {

					regulator-min-microvolt = <1225000>;

					regulator-max-microvolt = <1225000>;

				};



				l5 {

					/* TODO */

				};



				l6 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				l7 {

					/* TODO */

				};



				l8 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				l9 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

				};



				l10 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					qcom,init-voltage = <1800000>;

				};



				l11 {

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					qcom,init-voltage = <1200000>;

				};



				l12 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					qcom,init-voltage = <1800000>;

					proxy-supply = <&pm8994_l12>;

					qcom,proxy-consumer-enable;

					qcom,proxy-consumer-current = <10000>;

					status = "okay";

				};



				l13 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <2950000>;

					qcom,init-voltage = <2950000>;

					status = "okay";

				};



				l14 {

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					qcom,init-voltage = <1200000>;

					proxy-supply = <&pm8994_l14>;

					qcom,proxy-consumer-enable;

					qcom,proxy-consumer-current = <10000>;

					status = "okay";

				};



				l15 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					qcom,init-voltage = <1800000>;

					status = "okay";

				};



				l16 {

					regulator-min-microvolt = <2700000>;

					regulator-max-microvolt = <2700000>;

					qcom,init-voltage = <2700000>;

					status = "okay";

				};



				l17 {

					regulator-min-microvolt = <2700000>;

					regulator-max-microvolt = <2700000>;

					qcom,init-voltage = <2700000>;

					status = "okay";

				};



				l18 {

					regulator-min-microvolt = <3000000>;

					regulator-max-microvolt = <3000000>;

					regulator-always-on;

					qcom,init-voltage = <3000000>;

					qcom,init-ldo-mode = <1>;

				};



				l19 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					qcom,init-voltage = <1800000>;

					status = "okay";

				};



				l20 {

					regulator-min-microvolt = <2950000>;

					regulator-max-microvolt = <2950000>;

					regulator-always-on;

					regulator-boot-on;

					regulator-allow-set-load;

					regulator-system-load = <570000>;

				};



				l21 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

					qcom,init-voltage = <1800000>;

				};



				l22 {

					regulator-min-microvolt = <3100000>;

					regulator-max-microvolt = <3100000>;

					qcom,init-voltage = <3100000>;

				};



				l23 {

					regulator-min-microvolt = <2800000>;

					regulator-max-microvolt = <2800000>;

					qcom,init-voltage = <2800000>;

				};



				l24 {

					regulator-min-microvolt = <3075000>;

					regulator-max-microvolt = <3150000>;

					qcom,init-voltage = <3075000>;

				};



				l25 {

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					qcom,init-voltage = <1800000>;

				};



				l26 {

					/* TODO: value from downstream

					regulator-min-microvolt = <987500>;

					fails to apply */

				};



				l27 {

					regulator-min-microvolt = <1050000>;

					regulator-max-microvolt = <1050000>;

					qcom,init-voltage = <1050000>;

				};



				l28 {

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					qcom,init-voltage = <1000000>;

					proxy-supply = <&pm8994_l28>;

					qcom,proxy-consumer-enable;

					qcom,proxy-consumer-current = <10000>;

				};



				l29 {

					/* TODO: Unsupported voltage range.

					regulator-min-microvolt = <2800000>;

					regulator-max-microvolt = <2800000>;

					qcom,init-voltage = <2800000>;

					*/

				};



				l30 {

					/* TODO: get this verified

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					qcom,init-voltage = <1800000>;

					*/

				};



				l31 {

					regulator-min-microvolt = <1262500>;

					regulator-max-microvolt = <1262500>;

					qcom,init-voltage = <1262500>;

				};



				l32 {

					/* TODO: get this verified

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					qcom,init-voltage = <1800000>;

					*/

				};

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE