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

Commit 8cba9fa0 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: Add support for speed-bin 1 for MSM8937"

parents f910da0a dc7f1c99

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

+5 −3
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ 
		interrupts = <0 15 0>;

		regulator-name = "apc_corner";

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <6>;

		regulator-max-microvolt = <7>;



		qcom,cpr-fuse-corners = <3>;

		qcom,cpr-voltage-ceiling = <1155000 1225000 1350000>;
@@ -393,17 +393,19 @@ 
					<70 54 7 0>;

		qcom,cpr-fuse-quot-offset-scale = <5 5 5>;

		qcom,cpr-init-voltage-step = <10000>;

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

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

		qcom,cpr-corner-frequency-map =

				<1 960000000>,

				<2 1094400000>,

				<3 1209600000>,

				<4 1248000000>,

				<5 1344000000>,

				<6 1401000000>;

				<6 1401000000>,

				<7 1497600000>;

		qcom,speed-bin-fuse-sel = <37 34 3 0>;

		qcom,cpr-speed-bin-max-corners =

					<0 0 1 2 6>,

					<1 0 1 2 7>,

					<2 0 1 2 3>;

		qcom,cpr-fuse-revision = <69 39 3 0>;

		qcom,cpr-quot-adjust-scaling-factor-max = <0 1400 1400>;

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

+32 −9
Original line number Diff line number Diff line
@@ -692,12 +692,33 @@ 
			< 1344000000 5>,

			< 1401000000 6>;





		qcom,speed0-bin-v0-cci =

			<          0 0>,

			<  400000000 1>,

			<  533333333 3>;



		qcom,speed1-bin-v0-c0 =

			<          0 0>,

			<  768000000 1>,

			<  902400000 2>,

			<  998400000 4>,

			< 1094400000 6>,

			< 1209600000 7>;



		qcom,speed1-bin-v0-c1 =

			<          0 0>,

			<  960000000 1>,

			< 1094400000 2>,

			< 1248000000 4>,

			< 1344000000 5>,

			< 1401000000 6>,

			< 1497600000 7>;



		qcom,speed1-bin-v0-cci =

			<          0 0>,

			<  400000000 1>,

			<  533333333 3>;



		qcom,speed2-bin-v0-c0 =

			<          0 0>,

			<  768000000 1>,
@@ -740,13 +761,15 @@ 
			 < 1209600 >,

			 < 1248000 >,

			 < 1344000 >,

			 < 1401000 >;

			 < 1401000 >,

			 < 1497600 >;



		qcom,cpufreq-table-4 =

			 <  768000 >,

			 <  902400 >,

			 <  998400 >,

			 < 1094400 >;

			 < 1094400 >,

			 < 1209600 >;

	};



	cci_cache: qcom,cci {
@@ -812,12 +835,12 @@ 
			< 1094400  5053 >,	/* NOM   */

			< 1248000  5712 >,	/* NOM+  */

			< 1344000  7031 >,

			< 1401000  7031 >;	/* TURBO */

			< 1497600  7031 >;	/* TURBO */

		cpu-to-dev-map-4 =

			<  806400  2929 >,	/* SVS  */

			<  902400  5053 >,	/* NOM   */

			<  998400  6152 >,	/* NOM+  */

			< 1094400  7031 >;	/* TURBO */

			< 1209600  7031 >;	/* TURBO */

		};



		cci-cpufreq {
@@ -827,22 +850,22 @@ 
			< 1094400  400000 >,	/* NOM   */

			< 1248000  533333 >,	/* NOM+  */

			< 1344000  533333 >,

			< 1401000  533333 >;	/* TURBO */

			< 1497600  533333 >;	/* TURBO */

		cpu-to-dev-map-4 =

			<  806400  400000 >,	/* SVS  */

			<  902400  400000 >,	/* NOM   */

			<  998400  533333 >,	/* NOM+  */

			< 1094400  533333 >;	/* TURBO */

			< 1209600  533333 >;	/* TURBO */

		};



		mincpubw-cpufreq {

			target-dev = <&mincpubw>;

			cpu-to-dev-map-0 =

				< 1094400 2929 >,

				< 1401000 4248 >;

				< 1497600 4248 >;

			cpu-to-dev-map-4 =

				<  998400 2929 >,

				< 1094400 4248 >;

				< 1209600 4248 >;

		};

	};