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

Commit 5987f1a2 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: optimize CPR configurations for msm8226-v1/v2 and msm8926"

parents ff0c92ee b49dd694

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

+15 −19
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-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
@@ -19,7 +19,7 @@ 
			regulator-name = "8226_s2";

			reg = <0x1700 0x100>;

			regulator-min-microvolt = <900000>;

			regulator-max-microvolt = <1275000>;

			regulator-max-microvolt = <1350000>;

			qcom,mode = "auto";

		};

	};
@@ -35,22 +35,20 @@ 
		reg-names = "rbcpr", "rbcpr_clk", "efuse_addr";

		interrupts = <0 15 0>;

		regulator-name = "apc_corner";

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <3>;



		qcom,pvs-fuse-redun-sel = <22 24 3 2 0>;

		qcom,pvs-fuse = <22 6 5 0>;

		qcom,pvs-fuse-redun = <22 27 5 0>;



		qcom,pvs-init-voltage = <1275000 1275000 1275000 1275000 1275000

					1275000 1260000 1245000 1230000 1215000

					1200000 1185000 1170000 1155000 1140000

					1140000 1140000 1140000 1140000 1140000

		qcom,pvs-init-voltage = <1350000 1340000 1330000 1320000 1310000

					1300000 1290000 1280000 1270000 1260000

					1250000 1240000 1230000 1220000 1210000

					1200000 1190000 1180000 1170000 1160000

					1150000 1140000 1140000 1140000 1140000

					1140000 1140000 1140000 1275000 1275000

					1275000 1275000>;

		qcom,pvs-corner-ceiling-slow = <1050000 1150000 1275000>;

		qcom,pvs-corner-ceiling-nom  = <1050000 1075000 1200000>;

					1140000 1140000 1140000 1140000 1140000

					1140000 1140000>;

		qcom,pvs-corner-ceiling-slow = <1050000 1150000 1280000>;

		qcom,pvs-corner-ceiling-nom  = <1050000 1080000 1200000>;

		qcom,pvs-corner-ceiling-fast = <1050000 1050000 1100000>;

		vdd-apc-supply = <&pm8226_s2>;
@@ -63,14 +61,12 @@ 
		qcom,cpr-timer-cons-up = <0>;

		qcom,cpr-timer-cons-down = <2>;

		qcom,cpr-irq-line = <0>;

		qcom,cpr-step-quotient = <15>;

		qcom,cpr-up-threshold = <0>;

		qcom,cpr-down-threshold = <10>;

		qcom,cpr-step-quotient = <30>;

		qcom,cpr-idle-clocks = <0>;

		qcom,cpr-gcnt-time = <1>;

		qcom,vdd-apc-step-up-limit = <1>;

		qcom,vdd-apc-step-down-limit = <1>;

		qcom,cpr-apc-volt-step = <5000>;

		qcom,cpr-apc-volt-step = <10000>;



		qcom,cpr-fuse-redun-sel = <138 57 1 1 0>;

		qcom,cpr-fuse-row = <138 0>;
@@ -189,7 +185,7 @@ 
		pm8226_l3: regulator-l3 {

			regulator-name = "8226_l3";

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1275000>;

			regulator-max-microvolt = <1337500>;

			status = "okay";

		};

		pm8226_l3_ao: regulator-3-ao {
@@ -197,7 +193,7 @@ 
			regulator-name = "8226_l3_ao";

			qcom,set = <1>;

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1275000>;

			regulator-max-microvolt = <1337500>;

			status = "okay";

		};

		pm8226_l3_so: regulator-l3-so {
@@ -205,7 +201,7 @@ 
			regulator-name = "8226_l3_so";

			qcom,set = <2>;

			regulator-min-microvolt = <750000>;

			regulator-max-microvolt = <1275000>;

			regulator-max-microvolt = <1337500>;

			qcom,init-voltage = <750000>;

			status = "okay";

		};

arch/arm/boot/dts/qcom/msm8226-v1.dtsi

+36 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-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
@@ -65,3 +65,38 @@ 
	qcom,retain-periph;

	qcom,retain-mem;

};



&pm8226_s2 {

	regulator-max-microvolt = <1275000>;

};



&pm8226_l3 {

	regulator-max-microvolt = <1287500>;

};



&pm8226_l3_ao {

	regulator-max-microvolt = <1287500>;

};



&pm8226_l3_so {

	regulator-max-microvolt = <1287500>;

};



&apc_vreg_corner {

	regulator-min-microvolt = <1>;

	regulator-max-microvolt = <3>;

	qcom,pvs-init-voltage = <1275000 1275000 1275000 1275000 1275000

		1275000 1260000 1245000 1230000 1215000

		1200000 1185000 1170000 1155000 1140000

		1140000 1140000 1140000 1140000 1140000

		1150000 1140000 1140000 1140000 1140000

		1140000 1140000 1140000 1275000 1275000

		1275000 1275000>;

	qcom,pvs-corner-ceiling-slow = <1050000 1150000 1275000>;

	qcom,pvs-corner-ceiling-nom  = <1050000 1075000 1200000>;

	qcom,pvs-corner-ceiling-fast = <1050000 1050000 1100000>;

	qcom,cpr-step-quotient = <15>;

	qcom,cpr-apc-volt-step = <5000>;

	qcom,cpr-up-threshold = <0>;

	qcom,cpr-down-threshold = <10>;

};

arch/arm/boot/dts/qcom/msm8226-v2.dtsi

+0 −32
Original line number Diff line number Diff line
@@ -31,43 +31,11 @@ 
		      <223 0x20000>;

};



&pm8226_l3 {

	regulator-min-microvolt = <750000>;

	regulator-max-microvolt = <1337500>;

};



&pm8226_l3_ao {

	regulator-min-microvolt = <750000>;

	regulator-max-microvolt = <1337500>;

};



&pm8226_l3_so {

	regulator-min-microvolt = <750000>;

	regulator-max-microvolt = <1337500>;

};



&pm8226_s2 {

	regulator-min-microvolt = <900000>;

	regulator-max-microvolt = <1330000>;

};



&apc_vreg_corner {

	qcom,pvs-init-voltage = <1330000 1330000 1330000 1320000 1310000

					1300000 1290000 1280000 1270000 1260000

					1250000 1240000 1230000 1220000 1210000

					1200000 1190000 1180000 1170000 1160000

					1150000 1140000 1140000 1140000 1140000

					1140000 1140000 1140000 1140000 1140000

					1140000 1140000>;

	qcom,pvs-corner-ceiling-slow = <1050000 1150000 1280000>;

	qcom,pvs-corner-ceiling-nom  = <1050000 1080000 1200000>;

	qcom,pvs-corner-ceiling-fast = <1050000 1050000 1100000>;

	qcom,cpr-step-quotient = <30>;

	regulator-min-microvolt = <1>;

	regulator-max-microvolt = <14>;

	qcom,cpr-up-threshold = <0>;

	qcom,cpr-down-threshold = <5>;

	qcom,cpr-apc-volt-step = <10000>;

	qcom,cpr-corner-map = <1 1 2 2 3 3 3 3 3 3 3 3 3 3>;

	qcom,cpr-quot-adjust-table =

				<1 5 450>,

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

+0 −32
Original line number Diff line number Diff line
@@ -127,26 +127,6 @@ 
	};

};



&pm8226_l3 {

	regulator-min-microvolt = <750000>;

	regulator-max-microvolt = <1350000>;

};



&pm8226_l3_ao {

	regulator-min-microvolt = <750000>;

	regulator-max-microvolt = <1350000>;

};



&pm8226_l3_so {

	regulator-min-microvolt = <750000>;

	regulator-max-microvolt = <1350000>;

};



&pm8226_s2 {

	regulator-min-microvolt = <900000>;

	regulator-max-microvolt = <1350000>;

};



&tlmm_pinmux {

	gp: gp {

		qcom,num-pins = <120>;
@@ -154,20 +134,8 @@ 
};



&apc_vreg_corner {

	qcom,pvs-init-voltage = <1350000 1340000 1330000 1320000 1310000

					1300000 1290000 1280000 1270000 1260000

					1250000 1240000 1230000 1220000 1210000

					1200000 1190000 1180000 1170000 1160000

					1150000 1140000 1140000 1140000 1140000

					1140000 1140000 1140000 1140000 1140000

					1140000 1140000>;

	qcom,pvs-corner-ceiling-slow = <1050000 1150000 1280000>;

	qcom,pvs-corner-ceiling-nom  = <1050000 1080000 1200000>;

	qcom,pvs-corner-ceiling-fast = <1050000 1050000 1100000>;

	qcom,cpr-step-quotient = <30>;

	qcom,cpr-up-threshold = <0>;

	qcom,cpr-down-threshold = <2>;

	qcom,cpr-apc-volt-step = <10000>;

	regulator-min-microvolt = <1>;

	regulator-max-microvolt = <14>;

	qcom,cpr-corner-map = <1 1 2 2 3 3 3 3 3 3 3 3 3 3>;