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

Commit bb060db5 authored by Nicholas Troast's avatar Nicholas Troast
Browse files

ARM: dts: msm: switch to RPM controlled regulators for msmcobalt 



The RPM is available in standalone mode. Move the stub regulators
that should be controlled by the RPM under RPM control.

Use the new railway resources for core rails VDD_CX and VDD_MX.

CRs-Fixed: 887818
Change-Id: Ibe3feebc72753af6ca4cd7b129ea04ee5a5cdfec
Signed-off-by: default avatarNicholas Troast <ntroast@codeaurora.org>
parent 00df358f

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

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

	/* PMCOBALT S1 + S6 = VDD_CX supply */

	rpm-regulator-smpa1 {

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

		qcom,resource-name = "rwcx";

		qcom,resource-id = <0>;

		qcom,regulator-type = <1>;

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

		status = "disabled";



		regulator-s1 {

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

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

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpa5 {

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

		qcom,resource-name = "smpa";

		qcom,resource-id = <5>;

		qcom,regulator-type = <1>;

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

		status = "disabled";



		regulator-s5 {

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

			regulator-name = "pmcobalt_s5";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpa7 {

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

		qcom,resource-name = "smpa";

		qcom,resource-id = <7>;

		qcom,regulator-type = <1>;

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

		status = "disabled";



		regulator-s7 {

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

			regulator-name = "pmcobalt_s7";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpa8 {

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

		qcom,resource-name = "smpa";

		qcom,resource-id = <8>;

		qcom,regulator-type = <1>;

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

		status = "disabled";



		regulator-s8 {

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

			regulator-name = "pmcobalt_s8";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	/* PMCOBALT S9 = VDD_MX supply */

	rpm-regulator-smpa9 {

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

		qcom,resource-name = "rwmx";

		qcom,resource-id = <0>;

		qcom,regulator-type = <1>;

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

		status = "disabled";



		regulator-s9 {

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

			regulator-name = "pmcobalt_s9";

			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 = "pmcobalt_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 = "pmcobalt_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 = "pmcobalt_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 = "pmcobalt_l4";

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

			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 = "pmcobalt_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 = "pmcobalt_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 = "pmcobalt_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 = "pmcobalt_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 = "pmcobalt_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 = <10000>;

		status = "disabled";



		regulator-l13 {

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

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

		status = "disabled";



		regulator-l14 {

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

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

		status = "disabled";



		regulator-l15 {

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

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

		status = "disabled";



		regulator-l16 {

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

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

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa19 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <19>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l19 {

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

			regulator-name = "pmcobalt_l19";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa20 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <20>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l20 {

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

			regulator-name = "pmcobalt_l20";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa21 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <21>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l21 {

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

			regulator-name = "pmcobalt_l21";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa22 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <22>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l22 {

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

			regulator-name = "pmcobalt_l22";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa23 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <23>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l23 {

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

			regulator-name = "pmcobalt_l23";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa24 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <24>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l24 {

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

			regulator-name = "pmcobalt_l24";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa25 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <25>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l25 {

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

			regulator-name = "pmcobalt_l25";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa26 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <26>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l26 {

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

			regulator-name = "pmcobalt_l26";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa27 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <27>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l27 {

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

			regulator-name = "pmcobalt_l27";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldoa28 {

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

		qcom,resource-name = "ldoa";

		qcom,resource-id = <28>;

		qcom,regulator-type = <0>;

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

		status = "disabled";



		regulator-l28 {

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

			regulator-name = "pmcobalt_l28";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-vsa1 {

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

		qcom,resource-name = "vsa";

		qcom,resource-id = <1>;

		qcom,regulator-type = <2>;

		status = "disabled";



		regulator-lvs1 {

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

			regulator-name = "pmcobalt_lvs1";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-vsa2 {

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

		qcom,resource-name = "vsa";

		qcom,resource-id = <2>;

		qcom,regulator-type = <2>;

		status = "disabled";



		regulator-lvs2 {

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

			regulator-name = "pmcobalt_lvs2";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-bobb {

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

		qcom,resource-name = "bobb";

		qcom,resource-id = <1>;

		qcom,regulator-type = <4>;

		status = "disabled";



		regulator-bob {

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

			regulator-name = "pmcobalt_bob";

			qcom,set = <3>;

			status = "disabled";

		};

	};

};

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

+459 −350

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −3
Original line number Diff line number Diff line
@@ -1077,8 +1077,6 @@ 


};



#include "msmcobalt-regulator.dtsi"



&gdsc_mmss {

	status = "ok";

};
@@ -1193,4 +1191,5 @@ 


#include "msm-arm-smmu-cobalt.dtsi"

#include "msmcobalt-ion.dtsi"

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

#include "msmcobalt-regulator.dtsi"