Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35fb1915 authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy
Browse files

ARM: dts: msm: Change regulator names to match PMICs for MSM8992 



Change the regulator names used for MSM8992 so that they match the
PMIC types that will be present. MSM8992 boards will be utilizing
PMICs PM8994 and PMI8994. In addition, add a stub regulator device
for PMI8994 boost-bypass regulator which is required for some devices
under PMI8994.

Change-Id: I9f57947f233796ac2fb09261995ca3a61df39353
Signed-off-by: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
parent 156aa1e4

arch/arm/boot/dts/qcom/msm8992-regulator.dtsi

+103 −96
Original line number Diff line number Diff line
@@ -13,366 +13,373 @@ 
/* Stub regulators */



/ {

	/* PM8992 S1 + S6 = 2 phase VDD_CX supply */

	pm8992_s1_corner: regulator-pm8992-s1-corner {

	/* PM8994 S1 + S6 = 2 phase VDD_CX supply */

	pm8994_s1_corner: regulator-pm8994-s1-corner {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992_s1_corner";

		regulator-name = "pm8994_s1_corner";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

	};



	pm8992_s1_floor_corner: regulator-pm8992-s1-floor-corner {

	pm8994_s1_floor_corner: regulator-pm8994-s1-floor-corner {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992_s1_floor_corner";

		regulator-name = "pm8994_s1_floor_corner";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

	};



	pm8992_s1_corner_ao: regulator-pm8992-s1-corner-ao {

	pm8994_s1_corner_ao: regulator-pm8994-s1-corner-ao {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992_s1_corner_ao";

		regulator-name = "pm8994_s1_corner_ao";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

	};



	/* PM8992 S2 + S12 = 2 phase VDD_MX supply */

	pm8992_s2_corner: regulator-pm8992-s2-corner {

	/* PM8994 S2 + S12 = 2 phase VDD_MX supply */

	pm8994_s2_corner: regulator-pm8994-s2-corner {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992_s2_corner";

		regulator-name = "pm8994_s2_corner";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

	};



	pm8992_s2_corner_ao: regulator-pm8992-s2-corner-ao {

	pm8994_s2_corner_ao: regulator-pm8994-s2-corner-ao {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992_s2_corner_ao";

		regulator-name = "pm8994_s2_corner_ao";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

	};



	pm8992_s3: regulator-pm8992-s3 {

	pm8994_s3: regulator-pm8994-s3 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-s3";

		regulator-name = "pm8994-s3";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1300000>;

		regulator-max-microvolt = <1300000>;

	};



	pm8992_s4: regulator-pm8992-s4 {

	pm8994_s4: regulator-pm8994-s4 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-s4";

		regulator-name = "pm8994-s4";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8992_s5: regulator-pm8992-s5 {

	pm8994_s5: regulator-pm8994-s5 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-s5";

		regulator-name = "pm8994-s5";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <2150000>;

		regulator-max-microvolt = <2150000>;

	};



	pm8992_s7: regulator-pm8992-s7 {

	pm8994_s7: regulator-pm8994-s7 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-s7";

		regulator-name = "pm8994-s7";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1000000>;

	};



	/* PM8992 S8 + S9 + S10 + S11 = 4 phase VDD_APC supply */

	pm8992_s8: regulator-pm8992-s8 {

	/* PM8994 S8 + S9 + S10 + S11 = 4 phase VDD_APC supply */

	pm8994_s8: regulator-pm8994-s8 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-s8";

		regulator-name = "pm8994-s8";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1000000>;

	};



	pm8992_l1: regulator-pm8992-l1 {

	pm8994_l1: regulator-pm8994-l1 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l1";

		regulator-name = "pm8994-l1";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1000000>;

	};



	pm8992_l2: regulator-pm8992-l2 {

	pm8994_l2: regulator-pm8994-l2 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l2";

		regulator-name = "pm8994-l2";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1250000>;

		regulator-max-microvolt = <1250000>;

	};



	pm8992_l3: regulator-pm8992-l3 {

	pm8994_l3: regulator-pm8994-l3 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l3";

		regulator-name = "pm8994-l3";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

	};



	pm8992_l4: regulator-pm8992-l4 {

	pm8994_l4: regulator-pm8994-l4 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l4";

		regulator-name = "pm8994-l4";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1225000>;

		regulator-max-microvolt = <1225000>;

	};



	pm8992_l6: regulator-pm8992-l6 {

	pm8994_l6: regulator-pm8994-l6 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l6";

		regulator-name = "pm8994-l6";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8992_l8: regulator-pm8992-l8 {

	pm8994_l8: regulator-pm8994-l8 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l8";

		regulator-name = "pm8994-l8";

		qcom,hpm-min-load = <5000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8992_l9: regulator-pm8992-l9 {

	pm8994_l9: regulator-pm8994-l9 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l9";

		regulator-name = "pm8994-l9";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8992_l10: regulator-pm8992-l10 {

	pm8994_l10: regulator-pm8994-l10 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l10";

		regulator-name = "pm8994-l10";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8992_l11: regulator-pm8992-l11 {

	pm8994_l11: regulator-pm8994-l11 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l11";

		regulator-name = "pm8994-l11";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

	};



	pm8992_l12: regulator-pm8992-l12 {

	pm8994_l12: regulator-pm8994-l12 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l12";

		regulator-name = "pm8994-l12";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8992_l13: regulator-pm8992-l13 {

	pm8994_l13: regulator-pm8994-l13 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l13";

		regulator-name = "pm8994-l13";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2950000>;

	};



	pm8992_l14: regulator-pm8992-l14 {

	pm8994_l14: regulator-pm8994-l14 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l14";

		regulator-name = "pm8994-l14";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8992_l15: regulator-pm8992-l15 {

	pm8994_l15: regulator-pm8994-l15 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l15";

		regulator-name = "pm8994-l15";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8992_l16: regulator-pm8992-l16 {

	pm8994_l16: regulator-pm8994-l16 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l16";

		regulator-name = "pm8994-l16";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <2700000>;

	};



	pm8992_l17: regulator-pm8992-l17 {

	pm8994_l17: regulator-pm8994-l17 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l17";

		regulator-name = "pm8994-l17";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <2700000>;

	};



	pm8992_l18: regulator-pm8992-l18 {

	pm8994_l18: regulator-pm8994-l18 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l18";

		regulator-name = "pm8994-l18";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <2850000>;

		regulator-max-microvolt = <2850000>;

	};



	pm8992_l19: regulator-pm8992-l19 {

	pm8994_l19: regulator-pm8994-l19 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l19";

		regulator-name = "pm8994-l19";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <2800000>;

		regulator-max-microvolt = <2800000>;

	};



	pm8992_l20: regulator-pm8992-l20 {

	pm8994_l20: regulator-pm8994-l20 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l20";

		regulator-name = "pm8994-l20";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <2950000>;

		regulator-max-microvolt = <2950000>;

	};



	pm8992_l21: regulator-pm8992-l21 {

	pm8994_l21: regulator-pm8994-l21 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l21";

		regulator-name = "pm8994-l21";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <2950000>;

		regulator-max-microvolt = <2950000>;

	};



	pm8992_l22: regulator-pm8992-l22 {

	pm8994_l22: regulator-pm8994-l22 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l22";

		regulator-name = "pm8994-l22";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <3000000>;

		regulator-max-microvolt = <3000000>;

	};



	pm8992_l23: regulator-pm8992-l23 {

	pm8994_l23: regulator-pm8994-l23 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l23";

		regulator-name = "pm8994-l23";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <2800000>;

		regulator-max-microvolt = <2800000>;

	};



	pm8992_l24: regulator-pm8992-l24 {

	pm8994_l24: regulator-pm8994-l24 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l24";

		regulator-name = "pm8994-l24";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <3075000>;

		regulator-max-microvolt = <3075000>;

	};



	pm8992_l25: regulator-pm8992-l25 {

	pm8994_l25: regulator-pm8994-l25 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l25";

		regulator-name = "pm8994-l25";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1000000>;

	};



	pm8992_l26: regulator-pm8992-l26 {

	pm8994_l26: regulator-pm8994-l26 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l26";

		regulator-name = "pm8994-l26";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <988000>;

		regulator-max-microvolt = <988000>;

	};



	pm8992_l27: regulator-pm8992-l27 {

	pm8994_l27: regulator-pm8994-l27 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l27";

		regulator-name = "pm8994-l27";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1050000>;

		regulator-max-microvolt = <1050000>;

	};



	pm8992_l28: regulator-pm8992-l28 {

	pm8994_l28: regulator-pm8994-l28 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l28";

		regulator-name = "pm8994-l28";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1000000>;

	};



	pm8992_l29: regulator-pm8992-l29 {

	pm8994_l29: regulator-pm8994-l29 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l29";

		regulator-name = "pm8994-l29";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <2800000>;

		regulator-max-microvolt = <2800000>;

	};



	pm8992_l30: regulator-pm8992-l30 {

	pm8994_l30: regulator-pm8994-l30 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l30";

		regulator-name = "pm8994-l30";

		qcom,hpm-min-load = <5000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8992_l31: regulator-pm8992-l31 {

	pm8994_l31: regulator-pm8994-l31 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l31";

		regulator-name = "pm8994-l31";

		qcom,hpm-min-load = <10000>;

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

	};



	pm8992_l32: regulator-pm8992-l32 {

	pm8994_l32: regulator-pm8994-l32 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-l32";

		regulator-name = "pm8994-l32";

		qcom,hpm-min-load = <5000>;

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8992_lvs1: regulator-pm8992-lvs1 {

	pm8994_lvs1: regulator-pm8994-lvs1 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-lvs1";

		regulator-name = "pm8994-lvs1";

	};



	pm8992_lvs2: regulator-pm8992-lvs2 {

	pm8994_lvs2: regulator-pm8994-lvs2 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8992-lvs2";

		regulator-name = "pm8994-lvs2";

	};



	pmi8992_s1: regulator-pmi8992-s1{

	pmi8994_s1: regulator-pmi8994-s1{

		compatible = "qcom,stub-regulator";

		regulator-name = "pmi8992-s1";

		regulator-name = "pmi8994-s1";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1025000>;

		regulator-max-microvolt = <1025000>;

	};



	/* PMI8992 S2 + S3 = 2 phase VDD_GFX supply */

	pmi8992_s2_corner: regulator-pmi8992-s2-corner {

	/* PMI8994 S2 + S3 = 2 phase VDD_GFX supply */

	pmi8994_s2_corner: regulator-pmi8994-s2-corner {

		compatible = "qcom,stub-regulator";

		regulator-name = "pmi8992_s2_corner";

		regulator-name = "pmi8994_s2_corner";

		qcom,hpm-min-load = <100000>;

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

	};



	pmi8992_s2_floor_corner: regulator-pmi8992-s2-floor-corner {

	pmi8994_s2_floor_corner: regulator-pmi8994-s2-floor-corner {

		compatible = "qcom,stub-regulator";

		regulator-name = "pmi8992_s2_floor_corner";

		regulator-name = "pmi8994_s2_floor_corner";

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

	};



	pmi8992_boost: regulator-pmi8992-boost {

	pmi8994_boost: regulator-pmi8994-boost {

		compatible = "qcom,stub-regulator";

		regulator-name = "pmi8992-boost";

		regulator-name = "pmi8994-boost";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	pmi8994_boostbypass: regulator-pmi8994-bby {

		compatible = "qcom,stub-regulator";

		regulator-name = "pmi8994-boostbypass";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};

arch/arm/boot/dts/qcom/msm8992-sim.dts

+4 −4
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ 
};



&sdhc_1 {

	vdd-supply = <&pm8992_l20>;

	vdd-supply = <&pm8994_l20>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <200 570000>;



	vdd-io-supply = <&pm8992_s4>;

	vdd-io-supply = <&pm8994_s4>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <200 325000>;
@@ -49,11 +49,11 @@ 
};



&sdhc_2 {

	vdd-supply = <&pm8992_l21>;

	vdd-supply = <&pm8994_l21>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <200 800000>;



	vdd-io-supply = <&pm8992_l13>;

	vdd-io-supply = <&pm8994_l13>;

	qcom,vdd-io-voltage-level = <1800000 2950000>;

	qcom,vdd-io-current-level = <200 22000>;

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

+6 −6
Original line number Diff line number Diff line
@@ -500,11 +500,11 @@ 
				     "gpll0_mss_clk";



		interrupts = <0 24 1>;

		vdd_mss-supply = <&pm8992_s7>;

		vdd_cx-supply = <&pm8992_s1_corner>;

		vdd_mx-supply = <&pm8992_s2_corner>;

		vdd_mss-supply = <&pm8994_s7>;

		vdd_cx-supply = <&pm8994_s1_corner>;

		vdd_mx-supply = <&pm8994_s2_corner>;

		vdd_mx-uV = <7>;

		vdd_pll-supply = <&pm8992_l12>;

		vdd_pll-supply = <&pm8994_l12>;

		qcom,vdd_pll = <1800000>;

		qcom,firmware-name = "modem";

		qcom,pil-self-auth;
@@ -521,7 +521,7 @@ 
		reg = <0xfe200000 0x00100>;

		interrupts = <0 162 1>;



		vdd_cx-supply = <&pm8992_s1_corner>;

		vdd_cx-supply = <&pm8994_s1_corner>;

		qcom,proxy-reg-names = "vdd_cx";

		qcom,vdd_cx-uV-uA = <7 100000>;
@@ -891,7 +891,7 @@ 
	clock-names = "core_clk";

	clocks = <&clock_mmss clk_oxili_gfx3d_clk>;

	status = "ok";

	parent-supply = <&pmi8992_s2_corner>;

	parent-supply = <&pmi8994_s2_corner>;

};



#include "msm8992-ion.dtsi"