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

Commit d9a9a205 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 regulators on MSMFALCON"

parents dd4dc008 110f023c

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

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

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

		qcom,resource-name = "smpb";

		qcom,resource-id = <1>;

		qcom,regulator-type = <1>;

		status = "disabled";



		regulator-s1 {

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

			regulator-name = "pm2falcon_s1";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpb2 {

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

		qcom,resource-name = "smpb";

		qcom,resource-id = <2>;

		qcom,regulator-type = <1>;

		status = "disabled";



		regulator-s2 {

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

			regulator-name = "pm2falcon_s2";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpb3 {

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

		qcom,resource-name = "smpb";

		qcom,resource-id = <3>;

		qcom,regulator-type = <1>;

		status = "disabled";



		regulator-s3 {

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

			regulator-name = "pm2falcon_s3";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpb5 {

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

		qcom,resource-name = "smpb";

		qcom,resource-id = <5>;

		qcom,regulator-type = <1>;

		status = "disabled";



		regulator-s5 {

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

			regulator-name = "pm2falcon_s5";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldob1 {

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

		qcom,resource-name = "ldob";

		qcom,resource-id = <1>;

		qcom,regulator-type = <0>;

		status = "disabled";



		regulator-l1 {

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

			regulator-name = "pm2falcon_l1";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldob2 {

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

		qcom,resource-name = "ldob";

		qcom,resource-id = <2>;

		qcom,regulator-type = <0>;

		status = "disabled";



		regulator-l2 {

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

			regulator-name = "pm2falcon_l2";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldob3 {

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

		qcom,resource-name = "ldob";

		qcom,resource-id = <3>;

		qcom,regulator-type = <0>;

		status = "disabled";



		regulator-l3 {

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

			regulator-name = "pm2falcon_l3";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldob4 {

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

		qcom,resource-name = "ldob";

		qcom,resource-id = <4>;

		qcom,regulator-type = <0>;

		status = "disabled";



		regulator-l4 {

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

			regulator-name = "pm2falcon_l4";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldob5 {

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

		qcom,resource-name = "ldob";

		qcom,resource-id = <5>;

		qcom,regulator-type = <0>;

		status = "disabled";



		regulator-l5 {

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

			regulator-name = "pm2falcon_l5";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldob6 {

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

		qcom,resource-name = "ldob";

		qcom,resource-id = <6>;

		qcom,regulator-type = <0>;

		status = "disabled";



		regulator-l6 {

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

			regulator-name = "pm2falcon_l6";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldob7 {

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

		qcom,resource-name = "ldob";

		qcom,resource-id = <7>;

		qcom,regulator-type = <0>;

		status = "disabled";



		regulator-l7 {

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

			regulator-name = "pm2falcon_l7";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldob8 {

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

		qcom,resource-name = "ldob";

		qcom,resource-id = <8>;

		qcom,regulator-type = <0>;

		status = "disabled";



		regulator-l8 {

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

			regulator-name = "pm2falcon_l8";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldob9 {

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

		qcom,resource-name = "rwsc";

		qcom,resource-id = <9>;

		qcom,regulator-type = <0>;

		status = "disabled";



		regulator-l9 {

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

			regulator-name = "pm2falcon_l9";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-ldob10 {

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

		qcom,resource-name = "rwsm";

		qcom,resource-id = <10>;

		qcom,regulator-type = <0>;

		status = "disabled";



		regulator-l10 {

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

			regulator-name = "pm2falcon_l10";

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

			qcom,set = <3>;

			status = "disabled";

		};

	};

};

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

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

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

		qcom,resource-name = "smpa";

		qcom,resource-id = <4>;

		qcom,regulator-type = <1>;

		status = "disabled";



		regulator-s4 {

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

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

		status = "disabled";



		regulator-s5 {

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

			regulator-name = "pmfalcon_s5";

			qcom,set = <3>;

			status = "disabled";

		};

	};



	rpm-regulator-smpa6 {

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

		qcom,resource-name = "smpa";

		qcom,resource-id = <6>;

		qcom,regulator-type = <1>;

		status = "disabled";



		regulator-s6 {

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

			regulator-name = "pmfalcon_s6";

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

		status = "disabled";



		regulator-l1 {

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

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

		status = "disabled";



		regulator-l2 {

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

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

		status = "disabled";



		regulator-l3 {

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

			regulator-name = "pmfalcon_l3";

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

		status = "disabled";



		regulator-l5 {

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

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

		status = "disabled";



		regulator-l6 {

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

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

		status = "disabled";



		regulator-l7 {

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

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

		status = "disabled";



		regulator-l8 {

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

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

		status = "disabled";



		regulator-l9 {

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

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

		status = "disabled";



		regulator-l10 {

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

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

		status = "disabled";



		regulator-l11 {

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

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

		status = "disabled";



		regulator-l12 {

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

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

		status = "disabled";



		regulator-l13 {

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

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

		status = "disabled";



		regulator-l14 {

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

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

		status = "disabled";



		regulator-l15 {

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

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

		status = "disabled";



		regulator-l17 {

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

			regulator-name = "pmfalcon_l17";

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

		status = "disabled";



		regulator-l19 {

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

			regulator-name = "pmfalcon_l19";

			qcom,set = <3>;

			status = "disabled";

		};

	};

};

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

+395 −331

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ 


&sdhc_1 {

	/* device core power supply */

	vdd-supply = <&pmfalcon_l4b>;

	vdd-supply = <&pm2falcon_l4>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <200 570000>;



	/* device communication power supply */

	vdd-io-supply = <&pmfalcon_l8a>;

	vdd-io-supply = <&pmfalcon_l8>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

arch/arm/boot/dts/qcom/msmfalcon-sim.dts

+2 −2
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ 


&sdhc_1 {

	/* device core power supply */

	vdd-supply = <&pmfalcon_l4b>;

	vdd-supply = <&pm2falcon_l4>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <200 570000>;



	/* device communication power supply */

	vdd-io-supply = <&pmfalcon_l8a>;

	vdd-io-supply = <&pmfalcon_l8>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;