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

Commit 4194252b 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 msm8909"

parents a6d7ea17 90e01214

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

0 → 100644
+317 −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 = "pm8909_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 = "pm8909_s2";

			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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_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 = "pm8909_l15";

			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 = "pm8909_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 = "pm8909_l18";

			qcom,set = <3>;

			status = "disabled";

		};

	};

};

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

+234 −176
Original line number Diff line number Diff line
@@ -10,195 +10,253 @@ 
 * GNU General Public License for more details.

 */



/* Stub regulators */



/ {

	pm8909_s1: regulator-s1 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_s1";

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

		regulator-always-on;

		regulator-min-microvolt = <500000>;

		regulator-max-microvolt = <1350000>;

	};



/* RPM controlled regulators */

&rpm_bus {

	rpm-regulator-smpa1 {

		status = "okay";

		pm8909_s1_corner: regulator-s1-corner {

		compatible = "qcom,stub-regulator";

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

			regulator-name = "pm8909_s1_corner";

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

		};



		pm8909_s1_corner_ao: regulator-s1-corner-ao {

		compatible = "qcom,stub-regulator";

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

			regulator-name = "pm8909_s1_corner_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

		};

		pm8909_s1_floor_corner: regulator-s1-floor-corner {

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

			regulator-name = "pm8909_s1_floor_corner";

			qcom,set = <3>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-floor-corner;

			qcom,always-send-voltage;

		};

	};





	rpm-regulator-smpa2 {

		status = "okay";

		pm8909_s2: regulator-s2 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_s2";

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

		regulator-min-microvolt = <1950000>;

		regulator-max-microvolt = <1950000>;

			status = "okay";

			regulator-min-microvolt = <1850000>;

			regulator-max-microvolt = <1850000>;

			qcom,init-voltage = <1850000>;

		};

	};



	rpm-regulator-ldoa1 {

			status = "okay";

		pm8909_l1: regulator-l1 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l1";

		parent-supply = <&pm8909_s2>;

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

			status = "okay";

			regulator-min-microvolt = <1000000>;

			regulator-max-microvolt = <1000000>;

			qcom,init-voltage = <1000000>;

		};

	};



	rpm-regulator-ldoa2 {

			status = "okay";

		pm8909_l2: regulator-l2 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l2";

		parent-supply = <&pm8909_s2>;

		regulator-always-on;

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

			status = "okay";

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			qcom,init-voltage = <12000000>;

		};

	};



	/* PM8909 L3 VDD_MX supply */

	rpm-regulator-ldoa3 {

			status = "okay";

		pm8909_l3: regulator-l3 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l3";

		parent-supply = <&pm8909_s2>;

		regulator-always-on;

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

		regulator-min-microvolt = <1350000>;

			status = "okay";

			regulator-min-microvolt = <500000>;

			regulator-max-microvolt = <1350000>;

		};



		pm8909_l3_corner_ao: regulator-l3-corner-ao {

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

			regulator-name = "pm8909_l3_corner_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <1>;

			regulator-max-microvolt = <7>;

			qcom,use-voltage-corner;

		};



		pm8909_l3_corner_so: regulator-l3-corner-so {

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

			regulator-name = "pm8909_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";

		pm8909_l4: regulator-l4 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l4";

		parent-supply = <&pm8909_s2>;

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

			status = "okay";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

		};

	};



	rpm-regulator-ldoa5 {

			status = "okay";

		pm8909_l5: regulator-l5 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l5";

		parent-supply = <&pm8909_s2>;

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

		regulator-always-on;

			status = "okay";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

		};

	};



	rpm-regulator-ldoa6 {

			status = "okay";

		pm8909_l6: regulator-l6 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l6";

		parent-supply = <&pm8909_s2>;

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

			status = "okay";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

		};

	};



	rpm-regulator-ldoa7 {

			status = "okay";

		pm8909_l7: regulator-l7 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l7";

		parent-supply = <&pm8909_s2>;

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

			status = "okay";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

		};



		pm8909_l7_ao: regulator-l7-ao {

		compatible = "qcom,stub-regulator";

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

			regulator-name = "pm8909_l7_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-voltage = <1800000>;

		};



		pm8909_l7_so: regulator-l7-so {

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

			regulator-name = "pm8909_l7_so";

			qcom,set = <2>;

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			qcom,init-enable = <0>;

		};

	};



	rpm-regulator-ldoa8 {

			status = "okay";

		pm8909_l8: regulator-l8 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l8";

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

			status = "okay";

			regulator-min-microvolt = <2850000>;

			regulator-max-microvolt = <2900000>;

			qcom,init-voltage = <2850000>;

		};

	};



	rpm-regulator-ldoa9 {

			status = "okay";

		pm8909_l9: regulator-l9 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l9";

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

			status = "okay";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			qcom,init-voltage = <3300000>;

		};

	};



	rpm-regulator-ldoa10 {

			status = "okay";

		pm8909_l10: regulator-l10 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l10";

		parent-supply = <&pm8909_s2>;

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

			status = "okay";

			regulator-min-microvolt = <1225000>;

			regulator-max-microvolt = <1300000>;

			qcom,init-voltage = <1225000>;

		};

	};



	rpm-regulator-ldoa11 {

			status = "okay";

		pm8909_l11: regulator-l11 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l11";

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

			status = "okay";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2950000>;

			qcom,init-voltage = <1800000>;

		};

	};



	rpm-regulator-ldoa12 {

			status = "okay";

		pm8909_l12: regulator-l12 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l12";

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

			status = "okay";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <2950000>;

			qcom,init-voltage = <1800000>;

		};

	};



	rpm-regulator-ldoa13 {

			status = "okay";

		pm8909_l13: regulator-l13 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l13";

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

			status = "okay";

			regulator-min-microvolt = <3075000>;

			regulator-max-microvolt = <3075000>;

			qcom,init-voltage = <3075000>;

		};

	};



	rpm-regulator-ldoa14 {

			status = "okay";

		pm8909_l14: regulator-l14 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l14";

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

			status = "okay";

			regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2850000>;

			regulator-max-microvolt = <3000000>;

			qcom,init-voltage = <1800000>;

		};

	};



	rpm-regulator-ldoa15 {

			status = "okay";

		pm8909_l15: regulator-l15 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l15";

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

			status = "okay";

			regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2850000>;

			regulator-max-microvolt = <3000000>;

			qcom,init-voltage = <1800000>;

		};

	};



	rpm-regulator-ldoa17 {

			status = "okay";

		pm8909_l17: regulator-l17 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l17";

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

			status = "okay";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2850000>;

			qcom,init-voltage = <2800000>;

		};

	};



	rpm-regulator-ldoa18 {

			status = "okay";

		pm8909_l18: regulator-l18 {

		compatible = "qcom,stub-regulator";

		regulator-name = "pm8909_l18";

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

			status = "okay";

			regulator-min-microvolt = <2700000>;

		regulator-max-microvolt = <2850000>;

			regulator-max-microvolt = <2700000>;

			qcom,init-voltage = <2700000>;

		};

	};



};



&soc {

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

+1 −0
Original line number Diff line number Diff line
@@ -1554,6 +1554,7 @@ 
	};

};



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

#include "msm-pm8909.dtsi"

#include "msm8909-regulator.dtsi"