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

Commit 63ac9a67 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: switch to CPRh management of VDD_APC0 and VDD_APC1 on SDM845" into msm-4.9

parents 2db46736 8054e5ed

arch/arm64/boot/dts/qcom/sdm845-regulator.dtsi

+235 −21
Original line number Diff line number Diff line
@@ -26,30 +26,244 @@ 
		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

	};

};



	apc0_pwrcl_vreg: regulator-pwrcl {

		compatible = "qcom,stub-regulator";

&soc {

	/* CPR controller regulators */

	apc0_cpr: cprh-ctrl@17dc0000 {

		compatible = "qcom,cprh-sdm845-v1-kbss-regulator";

		reg =	<0x17dc0000 0x4000>,

			<0x00784000 0x1000>,

			<0x17840000 0x1000>;

		reg-names = "cpr_ctrl", "fuse_base", "saw";

		clocks = <&clock_gcc GCC_CPUSS_RBCPR_CLK>;

		clock-names = "core_clk";

		qcom,cpr-ctrl-name = "apc0";

		qcom,cpr-controller-id = <0>;



		qcom,cpr-sensor-time = <1000>;

		qcom,cpr-loop-time = <5000000>;

		qcom,cpr-idle-cycles = <15>;

		qcom,cpr-up-down-delay-time = <3000>;

		qcom,cpr-step-quot-init-min = <11>;

		qcom,cpr-step-quot-init-max = <12>;

		qcom,cpr-count-mode = <0>;		/* All at once */

		qcom,cpr-count-repeat = <1>;

		qcom,cpr-down-error-step-limit = <1>;

		qcom,cpr-up-error-step-limit = <1>;

		qcom,cpr-corner-switch-delay-time = <1042>;

		qcom,cpr-voltage-settling-time = <1760>;



		qcom,voltage-step = <4000>;

		qcom,voltage-base = <352000>;

		qcom,cpr-saw-use-unit-mV;



		qcom,saw-avs-ctrl = <0x101C031>;

		qcom,saw-avs-limit = <0x3A00000>;



		qcom,cpr-panic-reg-addr-list =

			<0x17dc3a84 0x17dc3a88 0x17840c18>;

		qcom,cpr-panic-reg-name-list =

			"APSS_SILVER_CPRH_STATUS_0",

			"APSS_SILVER_CPRH_STATUS_1",

			"SILVER_SAW4_PMIC_STS";



		thread@1 {

			qcom,cpr-thread-id = <1>;

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

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

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

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



			apc0_pwrcl_vreg: regulator {

				regulator-name = "apc0_pwrcl_corner";

				regulator-min-microvolt = <1>;

		regulator-max-microvolt = <23>;

	};



	apc0_l3_vreg: regulator-l3 {

		compatible = "qcom,stub-regulator";

				regulator-max-microvolt = <17>;



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

				qcom,cpr-fuse-combos = <8>;

				qcom,cpr-speed-bins = <1>;

				qcom,cpr-speed-bin-corners = <17>;

				qcom,cpr-corners = <17>;



				qcom,cpr-corner-fmax-map = <6 12 17>;



				qcom,cpr-voltage-ceiling =

					<688000  688000  688000  688000  688000

					 688000  756000  756000  756000  812000

					 812000  812000  872000  872000  872000

					 872000  928000>;



				qcom,cpr-voltage-floor =

					<568000  568000  568000  568000  568000

					 568000  568000  568000  568000  584000

					 584000  584000  632000  632000  632000

					 632000  672000>;



				qcom,cpr-floor-to-ceiling-max-range =

					<32000  32000  32000  32000  32000

					 32000  32000  32000  32000  32000

					 32000  32000  32000  32000  32000

					 32000  32000>;



				qcom,corner-frequencies =

					<300000000  422400000  499200000

					 576000000  652800000  748800000

					 825600000  902400000  979200000

					1056000000 1132800000 1209600000

					1286400000 1363200000 1440000000

					1516800000 1593600000>;



				qcom,allow-voltage-interpolation;

				qcom,allow-quotient-interpolation;

				qcom,cpr-scaled-open-loop-voltage-as-ceiling;

			};

		};



		thread@0 {

			qcom,cpr-thread-id = <0>;

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

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

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

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



			apc0_l3_vreg: regulator {

				regulator-name = "apc0_l3_corner";

				regulator-min-microvolt = <1>;

		regulator-max-microvolt = <19>;

	};



	apc1_perfcl_vreg: regulator-perfcl {

		compatible = "qcom,stub-regulator";

				regulator-max-microvolt = <9>;



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

				qcom,cpr-fuse-combos = <8>;

				qcom,cpr-speed-bins = <1>;

				qcom,cpr-speed-bin-corners = <9>;

				qcom,cpr-corners = <9>;



				qcom,cpr-corner-fmax-map = <4 7 9>;



				qcom,cpr-voltage-ceiling =

					<688000  688000  688000  688000  756000

					 812000  812000  872000  928000>;



				qcom,cpr-voltage-floor =

					<568000  568000  568000  568000  568000

					 584000  584000  632000  672000>;



				qcom,cpr-floor-to-ceiling-max-range =

					<32000  32000  32000  32000  32000

					 32000  32000  32000  32000>;



				qcom,corner-frequencies =

					<300000000  422400000  499200000

					 576000000  652800000  729600000

					 806400000  883200000  960000000>;



				qcom,allow-voltage-interpolation;

				qcom,allow-quotient-interpolation;

				qcom,cpr-scaled-open-loop-voltage-as-ceiling;

			};

		};

	};



	apc1_cpr: cprh-ctrl@17db0000 {

		compatible = "qcom,cprh-sdm845-kbss-regulator";

		reg =	<0x17db0000 0x4000>,

			<0x00784000 0x1000>,

			<0x17830000 0x1000>;

		reg-names = "cpr_ctrl", "fuse_base", "saw";

		clocks = <&clock_gcc GCC_CPUSS_RBCPR_CLK>;

		clock-names = "core_clk";

		qcom,cpr-ctrl-name = "apc1";

		qcom,cpr-controller-id = <1>;



		qcom,cpr-sensor-time = <1000>;

		qcom,cpr-loop-time = <5000000>;

		qcom,cpr-idle-cycles = <15>;

		qcom,cpr-up-down-delay-time = <3000>;

		qcom,cpr-step-quot-init-min = <9>;

		qcom,cpr-step-quot-init-max = <14>;

		qcom,cpr-count-mode = <0>;		/* All at once */

		qcom,cpr-count-repeat = <1>;

		qcom,cpr-down-error-step-limit = <1>;

		qcom,cpr-up-error-step-limit = <1>;

		qcom,cpr-corner-switch-delay-time = <1042>;

		qcom,cpr-voltage-settling-time = <1760>;



		qcom,apm-threshold-voltage = <800000>;

		qcom,apm-crossover-voltage = <880000>;

		qcom,mem-acc-threshold-voltage = <852000>;

		qcom,mem-acc-crossover-voltage = <852000>;



		qcom,voltage-step = <4000>;

		qcom,voltage-base = <352000>;

		qcom,cpr-saw-use-unit-mV;



		qcom,saw-avs-ctrl = <0x101C031>;

		qcom,saw-avs-limit = <0x4200000>;



		qcom,cpr-panic-reg-addr-list =

			<0x17db3a84 0x17830c18>;

		qcom,cpr-panic-reg-name-list =

			"APSS_GOLD_CPRH_STATUS_0", "GOLD_SAW4_PMIC_STS";



		thread@0 {

			qcom,cpr-thread-id = <0>;

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

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

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

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



			apc1_perfcl_vreg: regulator {

				regulator-name = "apc1_perfcl_corner";

				regulator-min-microvolt = <1>;

		regulator-max-microvolt = <26>;

				regulator-max-microvolt = <24>;



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

				qcom,cpr-fuse-combos = <8>;

				qcom,cpr-speed-bins = <1>;

				qcom,cpr-speed-bin-corners = <22>;

				qcom,cpr-corners = <22>;



				qcom,cpr-corner-fmax-map =

					<10 17 22>;



				qcom,cpr-voltage-ceiling =

					<756000  756000  756000  756000  756000

					 756000  756000  756000  756000  756000

					 812000  812000  828000  828000  828000

					 828000  828000  884000  952000  952000

					1056000 1056000>;



				qcom,cpr-voltage-floor =

					<568000  568000  568000  568000  568000

					 568000  568000  568000  568000  568000

					 584000  584000  632000  632000  632000

					 632000  632000  672000  712000  712000

					 772000  772000>;



				qcom,cpr-floor-to-ceiling-max-range =

					<32000  32000  32000  32000  32000

					 32000  32000  32000  32000  32000

					 32000  32000  32000  32000  32000

					 32000  32000  40000  40000  40000

					 40000  40000>;



				qcom,corner-frequencies =

					<300000000  422400000  499200000

					 576000000  652800000  729600000

					 806400000  883200000  960000000

					1036800000 1113600000 1190400000

					1267200000 1344000000 1420800000

					1497600000 1574400000 1651200000

					1728000000 1804800000 1881600000

					1958400000>;



				qcom,allow-voltage-interpolation;

				qcom,allow-quotient-interpolation;

				qcom,cpr-scaled-open-loop-voltage-as-ceiling;

			};

		};

	};



&soc {

	/* RPMh regulators: */



	/* PM8998 S1 = VDD_EBI supply */

arch/arm64/boot/dts/qcom/sdm845-rumi.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -109,6 +109,14 @@ 
	};

};



&apc0_cpr {

	qcom,cpr-ignore-invalid-fuses;

};



&apc1_cpr {

	qcom,cpr-ignore-invalid-fuses;

};



&ufsphy_card {

	compatible = "qcom,ufs-phy-qrbtc-sdm845";