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

Commit 7ef859f0 authored by David Collins's avatar David Collins
Browse files

ARM: dts: msm: switch to RPM control for most regulators on msmsamarium 



Convert most of the PMA8084 qpnp-regulator devices to
rpm-regulator-smd devices.  This ensures that requests made for
these regulators are aggregated by the RPM processor along with
the requests from other processors.

PMA8084 regulators SMPS 8, 9, 10, and 11 should not be converted
to rpm-regulator-smd devices because the RPM processor does not
provide support for these regulators.  These regulators power the
four application processor cores.

Lower the value specified for regulator-min-microvolt for
regulators S1 (VDD_MX) and S2 (VDD_CX) since the RPM is capable
of enforcing system-wide constraints on their final output
voltages.

Raise the value specified for regulator-max-microvolt for
regulators S1 and S2 so that they match hardware requirements.

Change-Id: I6ca15ce73c7cb7329c690b33be1ad104e09e0e93
Signed-off-by: default avatarDavid Collins <collinsd@codeaurora.org>
parent 86155e46

arch/arm/boot/dts/msmsamarium-regulator.dtsi

+320 −191
Original line number Diff line number Diff line
@@ -11,364 +11,493 @@ 
 * GNU General Public License for more details.

 */



/* QPNP controlled regulators: */



&spmi_bus {

	qcom,pma8084@1 {

		pma8084_s1: regulator@1400 {

			regulator-min-microvolt = <1050000>;

			regulator-max-microvolt = <1050000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

/* RPM controlled regulators: */

&rpm_bus {

	rpm-regulator-smpa1 {

		status = "okay";

		pma8084_s1: regulator-s1 {

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1260000>;

			status = "okay";

		};

		pma8084_s1_ao: regulator-s1-ao {

			regulator-name = "8084_s1_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1260000>;

			status = "okay";

			compatible = "qcom,rpm-regulator-smd";

		};

		pma8084_s1_so: regulator-s1-so {

			regulator-name = "8084_s1_so";

			qcom,set = <2>;

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1260000>;

			qcom,init-voltage = <750000>;

			status = "okay";

			compatible = "qcom,rpm-regulator-smd";

		};

	};



	/* PMA8084 S2 + S12 = 2 phase VDD_CX supply */

		pma8084_s2: regulator@1700 {

			regulator-min-microvolt = <1050000>;

			regulator-max-microvolt = <1050000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

	rpm-regulator-smpa2 {

		status = "okay";

		pma8084_s2: regulator-s2 {

			regulator-min-microvolt = <550000>;

			regulator-max-microvolt = <1260000>;

			status = "okay";

		};

		pma8084_s2_corner: regulator-s2-corner {

			regulator-name = "8084_s2_corner";

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

			compatible = "qcom,rpm-regulator-smd";

			qcom,consumer-supplies = "vdd_dig", "";

		};

		pma8084_s2_corner_ao: regulator-s2-corner-ao {

			regulator-name = "8084_s2_corner_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

			compatible = "qcom,rpm-regulator-smd";

		};

		pma8084_s2_floor_corner: regulator-s2-floor-corner {

			compatible = "qcom,rpm-regulator-smd";

			regulator-name = "8084_s2_floor_corner";

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-floor-corner;

			qcom,always-send-voltage;

		};

	};



		pma8084_s3: regulator@1a00 {

	rpm-regulator-smpa3 {

		status = "okay";

		pma8084_s3: regulator-s3 {

			regulator-min-microvolt = <1300000>;

			regulator-max-microvolt = <1300000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

			qcom,init-voltage = <1300000>;

			status = "okay";

		};

	};



		pma8084_s4: regulator@1d00 {

	rpm-regulator-smpa4 {

		status = "okay";

		pma8084_s4: regulator-s4 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



	/* Output of PMA8084 S5 and L25 is tied together. */

		pma8084_s5: regulator@2000 {

	rpm-regulator-smpa5 {

		status = "okay";

		pma8084_s5: regulator-s5 {

			regulator-min-microvolt = <2150000>;

			regulator-max-microvolt = <2150000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2150000>;

			status = "okay";

		};

	};



		pma8084_s6: regulator@2300 {

	rpm-regulator-smpa6 {

		status = "okay";

		pma8084_s6: regulator-s6 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1050000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1050000>;

			status = "okay";

		};

	};



		pma8084_s7: regulator@2600 {

	rpm-regulator-smpa7 {

		status = "okay";

		pma8084_s7: regulator-s7 {

			regulator-min-microvolt = <815000>;

			regulator-max-microvolt = <900000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-max-microvolt = <1050000>;

			status = "okay";

		};



		pma8084_s8: regulator@2900 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1100000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

			status = "okay";

		pma8084_s7_corner: regulator-s7-corner {

			compatible = "qcom,rpm-regulator-smd";

			regulator-name = "8084_s7_corner";

			qcom,set = <3>;

			qcom,use-voltage-corner;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,init-voltage-corner = <3>; /* SVS SOC */

		};



		pma8084_s9: regulator@2c00 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1100000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

			status = "okay";

		pma8084_s7_floor_corner: regulator-s7-floor-corner {

			compatible = "qcom,rpm-regulator-smd";

			regulator-name = "8084_s7_floor_corner";

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-floor-corner;

			qcom,always-send-voltage;

		};



		pma8084_s10: regulator@2f00 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1100000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

			status = "okay";

	};



		pma8084_s11: regulator@3200 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1100000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

	rpm-regulator-ldoa1 {

		status = "okay";

		};



		pma8084_l1: regulator@4000 {

			parent-supply = <&pma8084_s3>;

		pma8084_l1: regulator-l1 {

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <10000>;

			qcom,init-voltage = <1225000>;

			status = "okay";

		};

	};



		pma8084_l2: regulator@4100 {

			parent-supply = <&pma8084_s3>;

	rpm-regulator-ldoa2 {

		status = "okay";

		pma8084_l2: regulator-l2 {

			regulator-min-microvolt = <1175000>;

			regulator-max-microvolt = <1175000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1175000>;

			status = "okay";

		};

	};



		pma8084_l3: regulator@4200 {

			parent-supply = <&pma8084_s3>;

	rpm-regulator-ldoa3 {

		status = "okay";

		pma8084_l3: regulator-l3 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1200000>;

			status = "okay";

		};

	};



		pma8084_l4: regulator@4300 {

			parent-supply = <&pma8084_s3>;

	rpm-regulator-ldoa4 {

		status = "okay";

		pma8084_l4: regulator-l4 {

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1225000>;

			status = "okay";

		};

	};



		pma8084_l6: regulator@4500 {

			parent-supply = <&pma8084_s5>;

	rpm-regulator-ldoa5 {

		status = "okay";

		pma8084_l5: regulator-l5 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pma8084_l8: regulator@4700 {

	rpm-regulator-ldoa6 {

		status = "okay";

		pma8084_l6: regulator-l6 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pma8084_l9: regulator@4800 {

	rpm-regulator-ldoa7 {

		status = "okay";

		pma8084_l7: regulator-l7 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pma8084_l10: regulator@4900 {

	rpm-regulator-ldoa8 {

		status = "okay";

		pma8084_l8: regulator-l8 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



	rpm-regulator-ldoa9 {

		status = "okay";

		pma8084_l9: regulator-l9 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



	rpm-regulator-ldoa10 {

		status = "okay";

		pma8084_l10: regulator-l10 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pma8084_l11: regulator@4a00 {

			parent-supply = <&pma8084_s3>;

	rpm-regulator-ldoa11 {

		status = "okay";

		pma8084_l11: regulator-l11 {

			regulator-min-microvolt = <1300000>;

			regulator-max-microvolt = <1300000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1300000>;

			status = "okay";

		};

	};



		pma8084_l12: regulator@4b00 {

			parent-supply = <&pma8084_s5>;

	rpm-regulator-ldoa12 {

		status = "okay";

		pma8084_l12: regulator-l12 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

		pma8084_l12_ao: regulator-l12-ao {

			regulator-name = "8084_l12_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			status = "okay";

			compatible = "qcom,rpm-regulator-smd";

		};

	};



		pma8084_l13: regulator@4c00 {

	rpm-regulator-ldoa13 {

		status = "okay";

		pma8084_l13: regulator-l13 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2950000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2950000>;

			status = "okay";

		};

	};



		pma8084_l14: regulator@4d00 {

			parent-supply = <&pma8084_s5>;

	rpm-regulator-ldoa14 {

		status = "okay";

		pma8084_l14: regulator-l14 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pma8084_l15: regulator@4e00 {

			parent-supply = <&pma8084_s5>;

	rpm-regulator-ldoa15 {

		status = "okay";

		pma8084_l15: regulator-l15 {

			regulator-min-microvolt = <2050000>;

			regulator-max-microvolt = <2050000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2050000>;

			status = "okay";

		};

	};



		pma8084_l16: regulator@4f00 {

	rpm-regulator-ldoa16 {

		status = "okay";

		pma8084_l16: regulator-l16 {

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <2700000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2700000>;

			status = "okay";

		};

	};



		pma8084_l17: regulator@5000 {

	rpm-regulator-ldoa17 {

		status = "okay";

		pma8084_l17: regulator-l17 {

			regulator-min-microvolt = <2850000>;

			regulator-max-microvolt = <2850000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2850000>;

			status = "okay";

		};

	};



		pma8084_l18: regulator@5100 {

	rpm-regulator-ldoa18 {

		status = "okay";

		pma8084_l18: regulator-l18 {

			regulator-min-microvolt = <2850000>;

			regulator-max-microvolt = <2850000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2850000>;

			status = "okay";

		};

	};



		pma8084_l19: regulator@5200 {

	rpm-regulator-ldoa19 {

		status = "okay";

		pma8084_l19: regulator-l19 {

			regulator-min-microvolt = <2900000>;

			regulator-max-microvolt = <2900000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2900000>;

			status = "okay";

		};

	};



		pma8084_l20: regulator@5300 {

	rpm-regulator-ldoa20 {

		status = "okay";

		pma8084_l20: regulator-l20 {

			regulator-min-microvolt = <2950000>;

			regulator-max-microvolt = <2950000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2950000>;

			status = "okay";

		};

	};



		pma8084_l21: regulator@5400 {

	rpm-regulator-ldoa21 {

		status = "okay";

		pma8084_l21: regulator-l21 {

			regulator-min-microvolt = <2950000>;

			regulator-max-microvolt = <2950000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2950000>;

			status = "okay";

		};

	};



		pma8084_l22: regulator@5500 {

	rpm-regulator-ldoa22 {

		status = "okay";

		pma8084_l22: regulator-l22 {

			regulator-min-microvolt = <3000000>;

			regulator-max-microvolt = <3000000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <3000000>;

			status = "okay";

		};

	};



		pma8084_l23: regulator@5600 {

	rpm-regulator-ldoa23 {

		status = "okay";

		pma8084_l23: regulator-l23 {

			regulator-min-microvolt = <2850000>;

			regulator-max-microvolt = <2850000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2850000>;

			status = "okay";

		};

	};



		pma8084_l24: regulator@5700 {

	rpm-regulator-ldoa24 {

		status = "okay";

		pma8084_l24: regulator-l24 {

			regulator-min-microvolt = <3075000>;

			regulator-max-microvolt = <3075000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <3075000>;

			status = "okay";

		};

	};



		pma8084_l26: regulator@5900 {

			parent-supply = <&pma8084_s5>;

	rpm-regulator-ldoa25 {

		status = "okay";

		pma8084_l25: regulator-l25 {

			regulator-min-microvolt = <2100000>;

			regulator-max-microvolt = <2100000>;

			qcom,init-voltage = <2100000>;

			status = "okay";

		};

	};



	rpm-regulator-ldoa26 {

		status = "okay";

		pma8084_l26: regulator-l26 {

			regulator-min-microvolt = <2050000>;

			regulator-max-microvolt = <2050000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <2050000>;

			status = "okay";

		};

	};



		pma8084_l27: regulator@5a00 {

			parent-supply = <&pma8084_s3>;

	rpm-regulator-ldoa27 {

		status = "okay";

		pma8084_l27: regulator-l27 {

			regulator-min-microvolt = <1050000>;

			regulator-max-microvolt = <1050000>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

			qcom,init-voltage = <1050000>;

			status = "okay";

		};

	};



		pma8084_lvs1: regulator@8000 {

			parent-supply = <&pma8084_s4>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

	rpm-regulator-vsa1 {

		status = "okay";

		pma8084_lvs1: regulator-lvs1 {

			status = "okay";

		};

	};



		pma8084_lvs2: regulator@8100 {

			parent-supply = <&pma8084_s4>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

	rpm-regulator-vsa2 {

		status = "okay";

		pma8084_lvs2: regulator-lvs2 {

			status = "okay";

		};

	};



		pma8084_lvs3: regulator@8200 {

			parent-supply = <&pma8084_s4>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

	rpm-regulator-vsa3 {

		status = "okay";

		pma8084_lvs3: regulator-lvs3 {

			status = "okay";

		};

	};



		pma8084_lvs4: regulator@8300 {

			parent-supply = <&pma8084_s4>;

			qcom,enable-time = <200>;

			qcom,pull-down-enable = <1>;

	rpm-regulator-vsa4 {

		status = "okay";

		pma8084_lvs4: regulator-lvs4 {

			status = "okay";

		};

	};



	rpm-regulator-vsa5 {

		status = "okay";

		pma8084_mvs1: regulator-mvs1 {

			status = "okay";

		};

	};

};



		pma8084_mvs1: regulator@8400 {

			qcom,enable-time = <200>;

/* QPNP controlled regulators: */

&spmi_bus {

	qcom,pma8084@1 {

		pma8084_s8: regulator@2900 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1100000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

			status = "okay";

		};



		pma8084_s9: regulator@2c00 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1100000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

			status = "okay";

		};



		pma8084_s10: regulator@2f00 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1100000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

			status = "okay";

		};



&soc {

	pma8084_s2_corner: s2_corner_vreg {

		compatible = "qcom,stub-regulator";

		regulator-name = "8084_s2_corner";

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

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

		qcom,consumer-supplies = "vdd_dig", "";

		pma8084_s11: regulator@3200 {

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1100000>;

			qcom,enable-time = <500>;

			qcom,pull-down-enable = <1>;

			regulator-always-on;

			qcom,system-load = <100000>;

			status = "okay";

		};

	};

};

arch/arm/boot/dts/msmsamarium.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ 
	status = "ok";

};



/include/ "msm-pma8084-rpm-regulator.dtsi"

/include/ "msm-pma8084.dtsi"

/include/ "msmsamarium-regulator.dtsi"

/include/ "msmsamarium-mdss.dtsi"