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

Commit f83bb738 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 to RPM control for most regulators on MSM8916"

parents df0e9077 2f5dc391

arch/arm/boot/dts/qcom/msm-pm8916-rpm-regulator.dtsi

0 → 100644
+365 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&rpm_bus {

	rpm-regulator-smpa1 {

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

		qcom,resource-name = "smpa";

		qcom,resource-id = <1>;

		qcom,regulator-type = <1>;

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

		status = "disabled";



		regulator-s1 {

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

			regulator-name = "8916_s1";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpa2 {

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

		qcom,resource-name = "smpa";

		qcom,resource-id = <2>;

		qcom,regulator-type = <1>;

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

		status = "disabled";



		regulator-s2 {

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

			regulator-name = "8916_s2";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpa3 {

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

		qcom,resource-name = "smpa";

		qcom,resource-id = <3>;

		qcom,regulator-type = <1>;

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

		status = "disabled";



		regulator-s3 {

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

			regulator-name = "8916_s3";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpa4 {

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

		qcom,resource-name = "smpa";

		qcom,resource-id = <4>;

		qcom,regulator-type = <1>;

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

		status = "disabled";



		regulator-s4 {

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

			regulator-name = "8916_s4";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa1 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <1>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l1 {

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

			regulator-name = "8916_l1";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa2 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <2>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l2 {

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

			regulator-name = "8916_l2";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa3 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <3>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l3 {

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

			regulator-name = "8916_l3";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa4 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <4>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l4 {

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

			regulator-name = "8916_l4";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa5 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <5>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l5 {

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

			regulator-name = "8916_l5";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa6 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <6>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l6 {

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

			regulator-name = "8916_l6";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa7 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <7>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l7 {

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

			regulator-name = "8916_l7";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa8 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <8>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l8 {

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

			regulator-name = "8916_l8";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa9 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <9>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l9 {

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

			regulator-name = "8916_l9";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa10 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <10>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l10 {

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

			regulator-name = "8916_l10";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa11 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <11>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l11 {

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

			regulator-name = "8916_l11";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa12 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <12>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l12 {

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

			regulator-name = "8916_l12";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa13 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <13>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l13 {

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

			regulator-name = "8916_l13";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa14 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <14>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l14 {

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

			regulator-name = "8916_l14";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa15 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <15>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l15 {

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

			regulator-name = "8916_l15";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa16 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <16>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l16 {

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

			regulator-name = "8916_l16";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa17 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <17>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l17 {

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

			regulator-name = "8916_l17";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa18 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <18>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l18 {

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

			regulator-name = "8916_l18";

			qcom,set = <3>;

			status = "disabled";

		};

	};

};

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

+188 −121
Original line number Diff line number Diff line
@@ -10,30 +10,17 @@ 
 * GNU General Public License for more details.

 */



/* Stub regulators */

/ {

	pm8916_s1_corner: regulator-s1-corner {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_s1_corner";

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

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

	};



	pm8916_s1_corner_ao: regulator-s1-corner_ao {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_s1_corner_ao";

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

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <7>;

/* QPNP controlled regulators */

&spmi_bus {

	qcom,pm8916@1 {

		pm8916_s2: regulator@1700 {

			status = "okay";

			qcom,enable-time = <500>;

			regulator-min-microvolt = <900000>;

			regulator-max-microvolt = <1350000>;

			qcom,system-load = <100000>;

			regulator-always-on;

		};



	pm8916_l7_ao: regulator-l7_ao {

		compatible = "qcom,stub-regulator";

		regulator-name = "8916_l7_ao";

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

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};

};
@@ -83,183 +70,263 @@ 
	};

};



/* QPNP controlled regulators */

&spmi_bus {

	qcom,pm8916@1 {



		pm8916_s1: regulator@1400 {

			status = "okay";

			qcom,enable-time = <500>;

			regulator-min-microvolt = <1287500>;

			regulator-max-microvolt = <1287500>;

			qcom,system-load = <100000>;

			regulator-always-on;

		};

/* RPM controlled regulators */

&rpm_bus {



		pm8916_s2: regulator@1700 {

	/* PM8916 S1 VDD_CX supply */

	rpm-regulator-smpa1 {

		status = "okay";

			qcom,enable-time = <500>;

			regulator-min-microvolt = <900000>;

			regulator-max-microvolt = <1350000>;

			qcom,system-load = <100000>;

			regulator-always-on;

		pm8916_s1_corner: regulator-s1-corner {

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

			regulator-name = "8916_s1_corner";

			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,rpm-smd-regulator";

			regulator-name = "8916_s1_corner_ao";

			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_s3: regulator@1a00 {

	rpm-regulator-smpa3 {

		status = "okay";

			qcom,enable-time = <500>;

			regulator-min-microvolt = <1300000>;

		pm8916_s3: regulator-s3 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1300000>;

			qcom,system-load = <100000>;

			regulator-always-on;

			qcom,init-voltage = <1200000>;

			status = "okay";

		};

	};



		pm8916_s4: regulator@1d00 {

	rpm-regulator-smpa4 {

		status = "okay";

			qcom,enable-time = <500>;

			regulator-min-microvolt = <2100000>;

		pm8916_s4: regulator-s4 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2100000>;

			qcom,system-load = <100000>;

			regulator-always-on;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pm8916_l1: regulator@4000 {

	rpm-regulator-ldoa1 {

		status = "okay";

			parent-supply = <&pm8916_s3>;

			qcom,enable-time = <200>;

		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";

			parent-supply = <&pm8916_s3>;

			qcom,enable-time = <200>;

		pm8916_l2: regulator-l2 {

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			qcom,system-load = <10000>;

			regulator-always-on;

			qcom,init-voltage = <1200000>;

			status = "okay";

		};

	};



		pm8916_l3: regulator@4200 {

	/* PM8916 L3 VDD_MX supply */

	rpm-regulator-ldoa3 {

		status = "okay";

			parent-supply = <&pm8916_s3>;

			qcom,enable-time = <200>;

			regulator-min-microvolt = <1287500>;

		pm8916_l3: regulator-l3 {

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1287500>;

			status = "okay";

		};



		pm8916_l3_ao: regulator-l3-ao {

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

			regulator-name = "8916_l3_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1287500>;

			qcom,system-load = <10000>;

			regulator-always-on;

		};



		pm8916_l4: regulator@4300 {

		pm8916_l3_so: regulator-l3-so {

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

			regulator-name = "8916_l3_so";

			qcom,set = <2>;

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1287500>;

			qcom,init-voltage = <750000>;

		};

	};



	rpm-regulator-ldoa4 {

		status = "okay";

			parent-supply = <&pm8916_s4>;

			qcom,enable-time = <200>;

		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";

			parent-supply = <&pm8916_s4>;

			qcom,enable-time = <200>;

		pm8916_l5: regulator-l5 {

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,system-load = <10000>;

			regulator-always-on;

			qcom,init-voltage = <1800000>;

			status = "okay";

		};

	};



		pm8916_l6: regulator@4500 {

	rpm-regulator-ldoa6 {

		status = "okay";

			parent-supply = <&pm8916_s4>;

			qcom,enable-time = <200>;

		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";

			parent-supply = <&pm8916_s4>;

			qcom,enable-time = <200>;

		};



		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>;

			regulator-min-microvolt = <2900000>;

		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>;

		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>;

		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/msm8916.dtsi

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

};



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

#include "msm-pm8916.dtsi"

#include "msm8916-regulator.dtsi"

#include "msm8916-pm.dtsi"