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

Commit 66adb165 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: use CPR virtual corners for APC0 and APC1 on msm8994"

parents 900c49b6 95d4795f

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

+29 −2
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ 
		regulator-name = "apc0_corner";

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

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <3>;

		regulator-max-microvolt = <9>;



		qcom,cpr-voltage-ceiling = <900000 1000000 1115000>;

		qcom,cpr-voltage-floor =   <725000  840000  940000>;
@@ -555,6 +555,20 @@ 
					<138 12 6 0>;

		qcom,cpr-init-voltage-ref = <900000 1000000 1225000>;

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

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

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

		qcom,cpr-corner-frequency-map =

				<1 199200000>,

				<2 302400000>,

				<3 384000000>,

				<4 600000000>,

				<5 691200000>,

				<6 768000000>,

				<7 844800000>,

				<8 921600000>,

				<9 940800000>;

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

				<0xFFFFFFFF 0 1 3 9>;

	};



	apc1_vreg_corner: regulator@f901a000 {
@@ -565,7 +579,7 @@ 
		regulator-name = "apc1_corner";

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

		regulator-min-microvolt = <1>;

		regulator-max-microvolt = <3>;

		regulator-max-microvolt = <8>;



		qcom,cpr-voltage-ceiling = <900000 1000000 1225000>;

		qcom,cpr-voltage-floor =   <725000  840000  940000>;
@@ -606,6 +620,19 @@ 
					<139  2 6 0>;

		qcom,cpr-init-voltage-ref = <900000 1000000 1225000>;

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

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

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

		qcom,cpr-corner-frequency-map =

				<1 199200000>,

				<2 302400000>,

				<3 384000000>,

				<4 600000000>,

				<5 691200000>,

				<6 768000000>,

				<7 844800000>,

				<8 921600000>;

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

				<0xFFFFFFFF 0 1 3 8>;

	};



	bt_vreg: bt_vreg {

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

+27 −12
Original line number Diff line number Diff line
@@ -1733,19 +1733,34 @@ 
		vdd-dig-supply = <&pm8994_s1_corner_ao>;

		qcom,a53-speedbin0-v0 =

			<	   0 0>,

			< 249600000 1>,

			< 499200000 2>,

			< 940800000 3>;

			<  199200000 1>,

			<  302400000 2>,

			<  384000000 3>,

			<  600000000 4>,

			<  691200000 5>,

			<  768000000 6>,

			<  844800000 7>,

			<  921600000 8>,

			<  940800000 9>;

		qcom,a57-speedbin0-v0 =

			<	   0 0>,

			< 249600000 1>,

			< 499200000 2>,

			< 921600000 3>;

			<  199200000 1>,

			<  302400000 2>,

			<  384000000 3>,

			<  600000000 4>,

			<  691200000 5>,

			<  768000000 6>,

			<  844800000 7>,

			<  921600000 8>;

		qcom,cci-speedbin0-v0 =

			<	   0 0>,

			<  150000000 1>,

			< 300000000 2>,

			< 600000000 3>;

			<  200000000 2>,

			<  249600000 3>,

			<  300000000 4>,

			<  384000000 4>,

			<  499200000 7>,

			<  600000000 9>;

		clock-names = "xo_ao", "aux_clk";

		clocks = <&clock_rpm clk_cxo_clk_src_ao>,

			 <&clock_gcc clk_gpll0_ao>;