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

Commit 391bd8f9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "regulator: rpmh-regulator: add support for PMIC5 regulator modes"

parents 27b16faa 12851431

Documentation/devicetree/bindings/regulator/rpmh-regulator.txt

+21 −8
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ First Level Nodes - RPMh Interface 
		    a particular PMIC found in the system.  This name must match

		    to one that is defined by the bootloader.



- qcom,regulator-type

	Usage:      required if qcom,supported-modes is specified or if

		    qcom,init-mode is specified in any subnodes

	Value type: <string>

	Definition: The physical type of the regulator including the PMIC

		    family.  This is used for mode control.  Supported values:

		    "pmic4-ldo", "pmic4-hfsmps", "pmic4-ftsmps", "pmic4-bob",

		    "pmic5-ldo", "pmic5-hfsmps", "pmic5-ftsmps", and

		    "pmic5-bob".



- qcom,use-awake-state

	Usage:      optional

	Value type: <empty>
@@ -72,7 +82,7 @@ First Level Nodes - RPMh Interface 
	Value type: <prop-encoded-array>

	Definition: A list of integers specifying the PMIC regulator modes

		    supported by this regulator.  Supported values are

		    RPMH_REGULATOR_MODE_* (i.e. 0 to 7).  Elements must be

		    RPMH_REGULATOR_MODE_* (i.e. 0 to 4).  Elements must be

		    specified in order from lowest to highest.



- qcom,mode-threshold-currents
@@ -148,7 +158,7 @@ Second Level Nodes - Regulator Interfaces 
	Usage:      optional; VRM regulators only

	Value type: <u32>

	Definition: Specifies the initial mode to request for a VRM regulator.

		    Supported values are RPMH_REGULATOR_MODE_* (i.e. 0 to 7).

		    Supported values are RPMH_REGULATOR_MODE_* (i.e. 0 to 4).



- qcom,init-headroom-voltage

	Usage:      optional; VRM regulators only
@@ -212,9 +222,10 @@ rpmh-regulator-smpa2 { 
	compatible = "qcom,rpmh-vrm-regulator";

	mboxes = <&apps_rsc 0>;

	qcom,resource-name = "smpa2";

	qcom,regulator-type = "pmic4-smps";

	qcom,supported-modes =

		<RPMH_REGULATOR_MODE_SMPS_AUTO

		 RPMH_REGULATOR_MODE_SMPS_PWM>;

		<RPMH_REGULATOR_MODE_AUTO

		 RPMH_REGULATOR_MODE_HPM>;

	qcom,mode-threshold-currents = <0 2000000>;

	pm8998_s2: regulator-s2 {

		regulator-name = "pm8998_s2";
@@ -222,7 +233,7 @@ rpmh-regulator-smpa2 { 
		regulator-min-microvolt = <1100000>;

		regulator-max-microvolt = <1200000>;

		regulator-enable-ramp-delay = <200>;

		qcom,init-mode = <RPMH_REGULATOR_MODE_SMPS_AUTO>;

		qcom,init-mode = <RPMH_REGULATOR_MODE_AUTO>;

		qcom,init-voltage = <1150000>;

	};

};
@@ -232,9 +243,10 @@ rpmh-regulator-ldoa3-disp { 
	mboxes = <&disp_rsc 0>;

	qcom,use-awake-state;

	qcom,resource-name = "ldoa3";

	qcom,regulator-type = "pmic4-ldo";

	qcom,supported-modes =

		<RPMH_REGULATOR_MODE_LDO_LPM

		 RPMH_REGULATOR_MODE_LDO_HPM>;

		<RPMH_REGULATOR_MODE_LPM

		 RPMH_REGULATOR_MODE_HPM>;

	qcom,mode-threshold-currents = <0 10000>;

	qcom,always-wait-for-ack;

	pm8998_l3_disp_ao: regulator-l3-ao {
@@ -250,7 +262,7 @@ rpmh-regulator-ldoa3-disp { 
		qcom,set = <RPMH_REGULATOR_SET_SLEEP>;

		regulator-min-microvolt = <1000000>;

		regulator-max-microvolt = <1200000>;

		qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

		qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		qcom,init-voltage = <1000000>;

		qcom,init-enable = <0>;

	};
@@ -260,6 +272,7 @@ rpmh-regulator-ldoa4 { 
	compatible = "qcom,rpmh-vrm-regulator";

	mboxes = <&apps_rsc 0>;

	qcom,resource-name = "ldoa4";

	qcom,regulator-type = "pmic4-ldo";

	pm8998_l4-parent-supply = <&pm8998_s2>;

	pm8998_l4: regulator-l4 {

		regulator-name = "pm8998_l4";

arch/arm64/boot/dts/qcom/sdm855-regulator.dtsi

+99 −74
Original line number Diff line number Diff line
@@ -109,9 +109,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa1";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855_l1: regulator-pm855-l1 {

			regulator-name = "pm855_l1";
@@ -119,7 +120,7 @@ 
			regulator-min-microvolt = <752000>;

			regulator-max-microvolt = <752000>;

			qcom,init-voltage = <752000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -127,9 +128,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa2";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 10000>;

		pm855_l2: regulator-pm855-l2 {

			regulator-name = "pm855_l2";
@@ -137,7 +139,7 @@ 
			regulator-min-microvolt = <3072000>;

			regulator-max-microvolt = <3072000>;

			qcom,init-voltage = <3072000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -145,9 +147,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa3";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855_l3: regulator-pm855-l3 {

			regulator-name = "pm855_l3";
@@ -155,7 +158,7 @@ 
			regulator-min-microvolt = <480000>;

			regulator-max-microvolt = <932000>;

			qcom,init-voltage = <480000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -180,9 +183,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa5";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855_l5: regulator-pm855-l5 {

			regulator-name = "pm855_l5";
@@ -190,7 +194,7 @@ 
			regulator-min-microvolt = <880000>;

			regulator-max-microvolt = <880000>;

			qcom,init-voltage = <880000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -198,9 +202,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa6";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 10000>;

		pm855_l6: regulator-pm855-l6 {

			regulator-name = "pm855_l6";
@@ -208,7 +213,7 @@ 
			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			qcom,init-voltage = <1200000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -216,9 +221,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa7";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855_l7: regulator-pm855-l7 {

			regulator-name = "pm855_l7";
@@ -226,7 +232,7 @@ 
			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -251,9 +257,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa9";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 30000>;

		pm855_l9: regulator-pm855-l9 {

			regulator-name = "pm855_l9";
@@ -261,7 +268,7 @@ 
			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			qcom,init-voltage = <1200000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -269,9 +276,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa10";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 10000>;

		pm855_l10: regulator-pm855-l10 {

			regulator-name = "pm855_l10";
@@ -279,7 +287,7 @@ 
			regulator-min-microvolt = <2504000>;

			regulator-max-microvolt = <2960000>;

			qcom,init-voltage = <2504000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -287,9 +295,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa11";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855_l11: regulator-pm855-l11 {

			regulator-name = "pm855_l11";
@@ -297,7 +306,7 @@ 
			regulator-min-microvolt = <800000>;

			regulator-max-microvolt = <800000>;

			qcom,init-voltage = <800000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -305,9 +314,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa12";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855_l12: regulator-pm855-l12 {

			regulator-name = "pm855_l12";
@@ -315,7 +325,7 @@ 
			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -323,9 +333,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa13";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855_l13: regulator-pm855-l13 {

			regulator-name = "pm855_l13";
@@ -333,7 +344,7 @@ 
			regulator-min-microvolt = <2704000>;

			regulator-max-microvolt = <2704000>;

			qcom,init-voltage = <2704000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -341,9 +352,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa14";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 10000>;

		pm855_l14: regulator-pm855-l14 {

			regulator-name = "pm855_l14";
@@ -351,7 +363,7 @@ 
			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1880000>;

			qcom,init-voltage = <1800000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -359,9 +371,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa15";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855_l15: regulator-pm855-l15 {

			regulator-name = "pm855_l15";
@@ -369,7 +382,7 @@ 
			regulator-min-microvolt = <1704000>;

			regulator-max-microvolt = <1704000>;

			qcom,init-voltage = <1704000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -377,9 +390,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa16";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855_l16: regulator-pm855-l16 {

			regulator-name = "pm855_l16";
@@ -387,7 +401,7 @@ 
			regulator-min-microvolt = <2704000>;

			regulator-max-microvolt = <2960000>;

			qcom,init-voltage = <2704000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -395,9 +409,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoa17";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855_l17: regulator-pm855-l17 {

			regulator-name = "pm855_l17";
@@ -405,7 +420,7 @@ 
			regulator-min-microvolt = <2856000>;

			regulator-max-microvolt = <3008000>;

			qcom,init-voltage = <2856000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -545,9 +560,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoc2";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855l_l2: regulator-pm855l-l2 {

			regulator-name = "pm855l_l2";
@@ -555,7 +571,7 @@ 
			regulator-min-microvolt = <1304000>;

			regulator-max-microvolt = <1304000>;

			qcom,init-voltage = <1304000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -563,9 +579,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoc3";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855l_l3: regulator-pm855l-l3 {

			regulator-name = "pm855l_l3";
@@ -573,7 +590,7 @@ 
			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			qcom,init-voltage = <1200000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -581,9 +598,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoc4";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855l_l4: regulator-pm855l-l4 {

			regulator-name = "pm855l_l4";
@@ -591,7 +609,7 @@ 
			regulator-min-microvolt = <1704000>;

			regulator-max-microvolt = <2928000>;

			qcom,init-voltage = <1704000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -599,9 +617,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoc5";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855l_l5: regulator-pm855l-l5 {

			regulator-name = "pm855l_l5";
@@ -609,7 +628,7 @@ 
			regulator-min-microvolt = <1704000>;

			regulator-max-microvolt = <2928000>;

			qcom,init-voltage = <1704000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -617,9 +636,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoc6";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855l_l6: regulator-pm855l-l6 {

			regulator-name = "pm855l_l6";
@@ -627,7 +647,7 @@ 
			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2960000>;

			qcom,init-voltage = <1800000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -635,9 +655,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoc7";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855l_l7: regulator-pm855l-l7 {

			regulator-name = "pm855l_l7";
@@ -645,7 +666,7 @@ 
			regulator-min-microvolt = <2856000>;

			regulator-max-microvolt = <3104000>;

			qcom,init-voltage = <2856000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -665,9 +686,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoc9";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 10000>;

		pm855l_l9: regulator-pm855l-l9 {

			regulator-name = "pm855l_l9";
@@ -675,7 +697,7 @@ 
			regulator-min-microvolt = <2704000>;

			regulator-max-microvolt = <2960000>;

			qcom,init-voltage = <2704000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -683,9 +705,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoc10";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855l_l10: regulator-pm855l-l10 {

			regulator-name = "pm855l_l10";
@@ -693,7 +716,7 @@ 
			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3312000>;

			qcom,init-voltage = <3000000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -701,9 +724,10 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "ldoc11";

		qcom,regulator-type = "pmic5-ldo";

		qcom,supported-modes =

			<RPMH_REGULATOR_MODE_LDO_LPM

			 RPMH_REGULATOR_MODE_LDO_HPM>;

			<RPMH_REGULATOR_MODE_LPM

			 RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		pm855l_l11: regulator-pm855l-l11 {

			regulator-name = "pm855l_l11";
@@ -711,7 +735,7 @@ 
			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3312000>;

			qcom,init-voltage = <3000000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LDO_LPM>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};
@@ -719,6 +743,7 @@ 
		compatible = "qcom,rpmh-vrm-regulator";

		mboxes = <&apps_rsc 0>;

		qcom,resource-name = "bobc1";

		qcom,regulator-type = "pmic5-bob";

		qcom,send-defaults;



		pm855l_bob: regulator-pm855l-bob {
@@ -727,7 +752,7 @@ 
			regulator-min-microvolt = <3008000>;

			regulator-max-microvolt = <4000000>;

			qcom,init-voltage = <3312000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_BOB_PASS>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_PASS>;

		};



		pm855l_bob_ao: regulator-pm855l-bob-ao {
@@ -736,7 +761,7 @@ 
			regulator-min-microvolt = <3008000>;

			regulator-max-microvolt = <4000000>;

			qcom,init-voltage = <3008000>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_BOB_AUTO>;

			qcom,init-mode = <RPMH_REGULATOR_MODE_AUTO>;

		};

	};

};

drivers/regulator/rpmh-regulator.c

+290 −25

File changed.

Preview size limit exceeded, changes collapsed.

include/dt-bindings/regulator/qcom,rpmh-regulator.h

+30 −14
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -43,19 +43,35 @@ 


/*

 * These mode constants may be used for qcom,supported-modes and qcom,init-mode

 * properties of an RPMh resource.  Modes should be matched to the physical

 * PMIC regulator type (i.e. LDO, SMPS, or BOB).

 * properties of an RPMh resource.  Each type of regulator supports a subset of

 * the possible modes.

 *

 * %RPMH_REGULATOR_MODE_PASS:	Pass-through mode in which output is directly

 *				tied to input.  This mode is only supported by

 *				BOB type regulators.

 * %RPMH_REGULATOR_MODE_RET:	Retention mode in which only an extremely small

 *				load current is allowed.  This mode is supported

 *				by LDO and SMPS type regulators.

 * %RPMH_REGULATOR_MODE_LPM:	Low power mode in which a small load current is

 *				allowed.  This mode corresponds to PFM for SMPS

 *				and BOB type regulators.  This mode is supported

 *				by LDO, HFSMPS, BOB, and PMIC4 FTSMPS type

 *				regulators.

 * %RPMH_REGULATOR_MODE_AUTO:	Auto mode in which the regulator hardware

 *				automatically switches between LPM and HPM based

 *				upon the real-time load current.  This mode is

 *				supported by HFSMPS, BOB, and PMIC4 FTSMPS type

 *				regulators.

 * %RPMH_REGULATOR_MODE_HPM:	High power mode in which the full rated current

 *				of the regulator is allowed.  This mode

 *				corresponds to PWM for SMPS and BOB type

 *				regulators.  This mode is supported by all types

 *				of regulators.

 */

#define RPMH_REGULATOR_MODE_LDO_LPM	5

#define RPMH_REGULATOR_MODE_LDO_HPM	7



#define RPMH_REGULATOR_MODE_SMPS_PFM	5

#define RPMH_REGULATOR_MODE_SMPS_AUTO	6

#define RPMH_REGULATOR_MODE_SMPS_PWM	7



#define RPMH_REGULATOR_MODE_BOB_PASS	0

#define RPMH_REGULATOR_MODE_BOB_PFM	1

#define RPMH_REGULATOR_MODE_BOB_AUTO	2

#define RPMH_REGULATOR_MODE_BOB_PWM	3

#define RPMH_REGULATOR_MODE_PASS	0

#define RPMH_REGULATOR_MODE_RET		1

#define RPMH_REGULATOR_MODE_LPM		2

#define RPMH_REGULATOR_MODE_AUTO	3

#define RPMH_REGULATOR_MODE_HPM		4



#endif