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

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

Merge "ARM: dts: msm: switch regulators to RPM control for msm8939"

parents 4861187d a9a95021

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

+208 −154
Original line number Diff line number Diff line
@@ -49,248 +49,302 @@ 
/* Stub regulators */



/ {

	apc_vreg_corner: regulator-apc-corner {

		compatible = "qcom,stub-regulator";

		regulator-name = "apc_corner";

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <3>;

	};

};



/* RPM controlled regulators */



&rpm_bus {

	/* PM8916 S1 VDD_CX for MODEM/NAV/Crypto/MODEM Q6 */

	rpm-regulator-smpa1 {

		status = "okay";

		pm8916_s1_corner: regulator-s1-corner {

		compatible = "qcom,stub-regulator";

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

			regulator-name = "8916_s1_corner";

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

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

		};



		pm8916_s1_corner_ao: regulator-s1-corner-ao {

		compatible = "qcom,stub-regulator";

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

			regulator-name = "8916_s1_corner_ao";

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

			qcom,set = <1>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

		};

		pm8916_s1_floor_corner: regulator-s1-floor-corner {

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

			regulator-name = "8916_s1_floor_corner";

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-floor-corner;

			qcom,always-send-voltage;

		};

	};



	/* PM8916 S2 VDD_CX for Venus/TOP/GFX/Pronto/MDSS*/

	rpm-regulator-smpa2 {

		status = "okay";

		pm8916_s2_corner: regulator-s2-corner {

		compatible = "qcom,stub-regulator";

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

			regulator-name = "8916_s2_corner";

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

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

		};



		pm8916_s2_corner_ao: regulator-s2-corner-ao {

		compatible = "qcom,stub-regulator";

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

			regulator-name = "8916_s2_corner_ao";

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

			qcom,set = <1>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

		};



	apc_vreg_corner: regulator-apc-corner {

		compatible = "qcom,stub-regulator";

		regulator-name = "apc_corner";

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <3>;

	};



	pm8916_l3_corner: regulator-l3-corner {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l3_corner";

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

		pm8916_s2_floor_corner: regulator-s2-floor-corner {

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

			regulator-name = "8916_s2_floor_corner";

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-floor-corner;

			qcom,always-send-voltage;

		};



	pm8916_l3_corner_ao: regulator-l3-corner-ao {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l3_corner_ao";

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

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

	};



	pm8916_l7_ao: regulator-l7-ao {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l7_ao";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};

};



/* QPNP controlled regulators */



&spmi_bus {

	qcom,pm8916@1 {

		pm8916_s1: regulator@1400 {

	rpm-regulator-smpa3 {

		status = "okay";

			qcom,system-load = <100000>;

			qcom,enable-time = <500>;

			regulator-min-microvolt = <1287500>;

			regulator-max-microvolt = <1287500>;

			regulator-always-on;

		};



		pm8916_s2: regulator@1700 {

		pm8916_s3: regulator-s3 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1300000>;

			qcom,init-voltage = <1200000>;

			status = "okay";

			qcom,system-load = <100000>;

			qcom,enable-time = <500>;

			regulator-min-microvolt = <1287500>;

			regulator-max-microvolt = <1287500>;

			regulator-always-on;

		};



		pm8916_s3: regulator@1a00 {

			status = "okay";

			qcom,system-load = <100000>;

			qcom,enable-time = <500>;

			regulator-min-microvolt = <1300000>;

			regulator-max-microvolt = <1300000>;

			regulator-always-on;

	};



		pm8916_s4: regulator@1d00 {

	rpm-regulator-smpa4 {

		status = "okay";

			qcom,system-load = <100000>;

			qcom,enable-time = <500>;

			regulator-min-microvolt = <2100000>;

		pm8916_s4: regulator-s4 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2100000>;

			regulator-always-on;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pm8916_l1: regulator@4000 {

	rpm-regulator-ldoa1 {

		status = "okay";

			qcom,enable-time = <200>;

			parent-supply = <&pm8916_s3>;

		pm8916_l1: regulator-l1 {

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1225000>;

			qcom,init-voltage = <1225000>;

			status = "okay";

		};

	};



		pm8916_l2: regulator@4100 {

	rpm-regulator-ldoa2 {

		status = "okay";

			qcom,enable-time = <200>;

			qcom,system-load = <10000>;

			parent-supply = <&pm8916_s3>;

		pm8916_l2: regulator-l2 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			regulator-always-on;

			qcom,init-voltage = <1200000>;

			status = "okay";

		};

	};



		pm8916_l3: regulator@4200 {

	/* PM8916 L3 VDD_MX supply */

	rpm-regulator-ldoa3 {

		status = "okay";

			qcom,enable-time = <200>;

			qcom,system-load = <10000>;

			parent-supply = <&pm8916_s3>;

			regulator-min-microvolt = <1287500>;

		pm8916_l3: regulator-l3 {

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1287500>;

			regulator-always-on;

			status = "okay";

		};



		pm8916_l3_corner_ao: regulator-l3-corner-ao {

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

			regulator-name = "8916_l3_corner_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

		};



		pm8916_l4: regulator@4300 {

		pm8916_l3_corner_so: regulator-l3-corner-so {

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

			regulator-name = "8916_l3_corner_so";

			qcom,set = <2>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,init-voltage = <1>;

			qcom,use-voltage-corner;

		};

	};



	rpm-regulator-ldoa4 {

		status = "okay";

			qcom,enable-time = <200>;

			parent-supply = <&pm8916_s4>;

		pm8916_l4: regulator-l4 {

			regulator-min-microvolt = <2050000>;

			regulator-max-microvolt = <2050000>;

			qcom,init-voltage = <2050000>;

			status = "okay";

		};

	};



		pm8916_l5: regulator@4400 {

	rpm-regulator-ldoa5 {

		status = "okay";

			qcom,enable-time = <200>;

			qcom,system-load = <10000>;

			parent-supply = <&pm8916_s4>;

		pm8916_l5: regulator-l5 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-always-on;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pm8916_l6: regulator@4500 {

	rpm-regulator-ldoa6 {

		status = "okay";

			qcom,enable-time = <200>;

			parent-supply = <&pm8916_s4>;

		pm8916_l6: regulator-l6 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pm8916_l7: regulator@4600 {

	rpm-regulator-ldoa7 {

		status = "okay";

		pm8916_l7: regulator-l7 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

			status = "okay";

			qcom,enable-time = <200>;

			parent-supply = <&pm8916_s4>;

		};



		pm8916_l7_ao: regulator-l7-ao {

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

			regulator-name = "8916_l7_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

		};

	};



		pm8916_l8: regulator@4700 {

	rpm-regulator-ldoa8 {

		status = "okay";

			qcom,enable-time = <200>;

		pm8916_l8: regulator-l8 {

			regulator-min-microvolt = <2850000>;

			regulator-max-microvolt = <2900000>;

			qcom,init-voltage = <2850000>;

			status = "okay";

		};

	};



		pm8916_l9: regulator@4800 {

	rpm-regulator-ldoa9 {

		status = "okay";

			qcom,enable-time = <200>;

		pm8916_l9: regulator-l9 {

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			qcom,init-voltage = <3300000>;

			status = "okay";

		};

	};



		pm8916_l10: regulator@4900 {

	rpm-regulator-ldoa10 {

		status = "okay";

			qcom,enable-time = <200>;

		pm8916_l10: regulator-l10 {

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <2800000>;

			qcom,init-voltage = <2700000>;

			status = "okay";

		};

	};



		pm8916_l11: regulator@4a00 {

	rpm-regulator-ldoa11 {

		status = "okay";

			qcom,enable-time = <200>;

		pm8916_l11: regulator-l11 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2950000>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pm8916_l12: regulator@4b00 {

	rpm-regulator-ldoa12 {

		status = "okay";

			qcom,enable-time = <200>;

		pm8916_l12: regulator-l12 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2950000>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pm8916_l13: regulator@4c00 {

	rpm-regulator-ldoa13 {

		status = "okay";

			qcom,enable-time = <200>;

		pm8916_l13: regulator-l13 {

			regulator-min-microvolt = <3075000>;

			regulator-max-microvolt = <3075000>;

			qcom,init-voltage = <3075000>;

			status = "okay";

		};

	};



		pm8916_l14: regulator@4d00 {

	rpm-regulator-ldoa14 {

		status = "okay";

			qcom,enable-time = <200>;

			qcom,system-load = <5000>;

		pm8916_l14: regulator-l14 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <3300000>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pm8916_l15: regulator@4e00 {

	rpm-regulator-ldoa15 {

		status = "okay";

			qcom,enable-time = <200>;

		pm8916_l15: regulator-l15 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <3300000>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pm8916_l16: regulator@4f00 {

	rpm-regulator-ldoa16 {

		status = "okay";

			qcom,enable-time = <200>;

		pm8916_l16: regulator-l16 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <3300000>;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pm8916_l17: regulator@5000 {

	rpm-regulator-ldoa17 {

		status = "okay";

			qcom,enable-time = <200>;

			regulator-min-microvolt = <2700000>;

		pm8916_l17: regulator-l17 {

			regulator-min-microvolt = <2850000>;

			regulator-max-microvolt = <2850000>;

			qcom,init-voltage = <2850000>;

			status = "okay";

		};

	};



		pm8916_l18: regulator@5100 {

	rpm-regulator-ldoa18 {

		status = "okay";

			qcom,enable-time = <200>;

		pm8916_l18: regulator-l18 {

			regulator-min-microvolt = <2700000>;

			regulator-max-microvolt = <2700000>;

			qcom,init-voltage = <2700000>;

			status = "okay";

		};

	};

};

arch/arm/boot/dts/qcom/msm8939-rumi.dts

+0 −214
Original line number Diff line number Diff line
@@ -158,220 +158,6 @@ 
	status = "okay";

};



&spmi_bus {

	qcom,pm8916@1 {

		/delete-node/ regulator@1400;

		/delete-node/ regulator@1700;

		/delete-node/ regulator@1a00;

		/delete-node/ regulator@1d00;

		/delete-node/ regulator@4000;

		/delete-node/ regulator@4100;

		/delete-node/ regulator@4200;

		/delete-node/ regulator@4300;

		/delete-node/ regulator@4400;

		/delete-node/ regulator@4500;

		/delete-node/ regulator@4600;

		/delete-node/ regulator@4700;

		/delete-node/ regulator@4800;

		/delete-node/ regulator@4900;

		/delete-node/ regulator@4a00;

		/delete-node/ regulator@4b00;

		/delete-node/ regulator@4c00;

		/delete-node/ regulator@4d00;

		/delete-node/ regulator@4e00;

		/delete-node/ regulator@4f00;

		/delete-node/ regulator@5000;

		/delete-node/ regulator@5100;

	};

};



/* Stub regulators */



/ {

	pm8916_s1: regulator-s1 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_s1";

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

		regulator-min-microvolt = <500000>;

		regulator-max-microvolt = <1287500>;

	};



	pm8916_s2: regulator-s2 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_s2";

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

		regulator-min-microvolt = <500000>;

		regulator-max-microvolt = <1287500>;

	};



	pm8916_s3: regulator-s3 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_s3";

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

		regulator-min-microvolt = <1300000>;

		regulator-max-microvolt = <1300000>;

	};



	pm8916_s4: regulator-s4 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_s4";

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

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2100000>;

	};



	pm8916_l1: regulator-l1 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l1";

		parent-supply = <&pm8916_s3>;

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

		regulator-min-microvolt = <1225000>;

		regulator-max-microvolt = <1225000>;

	};



	pm8916_l2: regulator-l2 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l2";

		parent-supply = <&pm8916_s3>;

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

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;

	};



	pm8916_l3: regulator-l3 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l3";

		parent-supply = <&pm8916_s3>;

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

		regulator-min-microvolt = <1337500>;

		regulator-max-microvolt = <1337500>;

	};



	pm8916_l4: regulator-l4 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l4";

		parent-supply = <&pm8916_s4>;

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

		regulator-min-microvolt = <2050000>;

		regulator-max-microvolt = <2050000>;

	};



	pm8916_l5: regulator-l5 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l5";

		parent-supply = <&pm8916_s4>;

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

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8916_l6: regulator-l6 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l6";

		parent-supply = <&pm8916_s4>;

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

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8916_l7: regulator-l7 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l7";

		parent-supply = <&pm8916_s4>;

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

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};



	pm8916_l8: regulator-l8 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l8";

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

		regulator-min-microvolt = <2850000>;

		regulator-max-microvolt = <2900000>;

	};



	pm8916_l9: regulator-l9 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l9";

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

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	pm8916_l10: regulator-l10 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l10";

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

		regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <2800000>;

	};



	pm8916_l11: regulator-l11 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l11";

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

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2950000>;

	};



	pm8916_l12: regulator-l12 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l12";

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

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2950000>;

	};



	pm8916_l13: regulator-l13 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l13";

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

		regulator-min-microvolt = <3075000>;

		regulator-max-microvolt = <3075000>;

	};



	pm8916_l14: regulator-l14 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l14";

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

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

	};



	pm8916_l15: regulator-l15 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l15";

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

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

	};



	pm8916_l16: regulator-l16 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l16";

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

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

	};



	pm8916_l17: regulator-l17 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l17";

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

		regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <2850000>;

	};



	pm8916_l18: regulator-l18 {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l18";

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

		regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <2700000>;

	};

};



&ncp6335d {

	status = "disabled";

};

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

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

};



#include "msm-pm8916-rpm-regulator.dtsi"

#include "msm-pm8916.dtsi"

#include "msm8939-regulator.dtsi"