Merge "clk: msm: clock-8996: Load OPP tables from generic clock driver" (8e5b0313) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/arm/msm/clock-controller.txt

+7 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ Required properties:
		"qcom,gpucc-8996"
		"qcom,gpucc-8996-v2"
		"qcom,gpucc-8996-v3"
		"qcom,gpucc-8996-v3.0"
		"qcom,gcc-californium"
		"qcom,cc-debug-californium"

		@@ -77,7 +78,12 @@ Optional properties:
		operate at. Drivers can use the OPP library API to
		operate on the list of OPPs registered using these
		values.

		- qcom,<clock-name>-opp-handle: phandle references to the devices for which OPP
		table is filled with the clock frequency and voltage
		values.
		- qcom,<clock-name>-opp-store-vcorner: phandle references to the devices for
		which OPP table is filled with the clock frequency
		and voltage corner/level.

		Example:
		clock_rpm: qcom,rpmcc@fc4000000 {

Documentation/devicetree/bindings/regulator/cpr3-mmss-regulator.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,8 @@ MMSS specific properties:
		the device. This value is utilized by several other
		properties. Supported values are 1 up to the maximum
		possible for a given regulator type. For MMSS the maximum
		supported value is 1.
		supported value is 8. These combos correspond to CPR
		revision fuse values from 0 to 7 in order.

		- qcom,cpr-target-quotients
		Usage: required

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

+21 −17

Original line number	Diff line number	Diff line
		@@ -560,7 +560,7 @@
		qcom,cpr-loop-time = <5000000>;
		qcom,cpr-idle-cycles = <15>;
		qcom,cpr-up-down-delay-time = <3000>;
		qcom,cpr-step-quot-init-min = <13>;
		qcom,cpr-step-quot-init-min = <11>;
		qcom,cpr-step-quot-init-max = <13>;
		qcom,cpr-count-mode = <2>; /* Staggered */

		@@ -805,15 +805,13 @@
		qcom,cpr-sensor-time = <1000>;
		qcom,cpr-loop-time = <5000000>;
		qcom,cpr-idle-cycles = <15>;
		qcom,cpr-step-quot-init-min = <13>;
		qcom,cpr-step-quot-init-min = <10>;
		qcom,cpr-step-quot-init-max = <13>;
		qcom,cpr-count-mode = <2>; /* Staggered */

		vdd-supply = <&pmi8994_s2>;
		qcom,voltage-step = <5000>;

		system-supply = <&pm8994_s1_corner>;

		qcom,cpr-enable;

		thread@0 {
		@@ -826,32 +824,33 @@
		gfx_vreg: regulator {
		regulator-name = "gfx_corner";
		regulator-min-microvolt = <1>;
		regulator-max-microvolt = <7>;
		regulator-max-microvolt = <8>;

		qcom,cpr-fuse-corners = <4>;
		qcom,cpr-fuse-combos = <1>;
		qcom,cpr-corners = <7>;
		qcom,cpr-fuse-combos = <2>;
		qcom,cpr-corners = <8>;

		qcom,cpr-corner-fmax-map = <2 3 5 7>;
		qcom,cpr-corner-fmax-map = <2 4 6 8>;

		qcom,cpr-voltage-ceiling =
		<400000 670000 745000 825000 905000
		960000 1015000>;
		<400000 670000 670000 745000 825000
		905000 960000 1015000>;
		qcom,cpr-voltage-floor =
		<400000 520000 520000 520000 520000
		520000 520000>;

		qcom,system-voltage = <2 2 2 2 2 2 4>;
		520000 520000 520000>;

		qcom,corner-frequencies =
		<0 210000000 300000000 401800000
		510000000 549000000 624000000>;
		<0 133000000 210000000 300000000
		401800000 510000000 549000000
		624000000>;

		qcom,cpr-target-quotients =
		< 0 0 0 0 0 0 0 0
		0 0 0 0 0 0 0 0>,
		< 0 0 0 0 0 0 287 273
		425 426 443 453 0 0 0 0>,
		< 0 0 0 0 0 0 287 273
		425 426 443 453 0 0 0 0>,
		< 0 0 0 0 0 0 414 392
		584 576 608 612 0 0 0 0>,
		< 0 0 0 0 0 0 459 431
		@@ -876,15 +875,20 @@
		1959 2131 2246 2253 0 0 0 0>,
		< 0 0 0 0 0 0 2035 1917
		1959 2131 2246 2253 0 0 0 0>,
		< 0 0 0 0 0 0 2035 1917
		1959 2131 2246 2253 0 0 0 0>,
		< 0 0 0 0 0 0 2035 1917
		1959 2131 2246 2253 0 0 0 0>;

		qcom,cpr-open-loop-voltage-fuse-adjustment =
		<30000 30000 30000 0>,
		<0 0 0 0>;
		qcom,cpr-closed-loop-voltage-adjustment =
		<0 0 0 0 0 0 0>;
		<0 30000 30000 30000 30000 30000 0 0>,
		<0 30000 30000 30000 30000 30000 0 0>;
		qcom,cpr-floor-to-ceiling-max-range =
		<0 70000 75000 80000 90000 95000 100000>;
		<0 70000 70000 75000 80000 90000 95000
		100000>;

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

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@

		&clock_gpu {
		compatible = "qcom,gpucc-8996-v2";
		qcom,gfx3d_clk_src_v2-opp-handle = <&msm_gpu>;
		qcom,gfxfreq-corner-v2 =
		< 0 0 0 >,
		< 125000000 3 4 >,
		@@ -240,6 +241,7 @@
		};

		&gfx_cpr {
		system-supply = <&pm8994_s1_corner>;
		qcom,cpr-enable;
		};

		@@ -248,7 +250,7 @@
		regulator-max-microvolt = <5>;

		qcom,cpr-fuse-corners = <4>;
		qcom,cpr-fuse-combos = <1>;
		qcom,cpr-fuse-combos = <8>;
		qcom,cpr-corners = <5>;

		qcom,cpr-corner-fmax-map = <2 3 4 5>;

arch/arm/boot/dts/qcom/msm8996-v3.0.dtsi

+87 −0

Original line number	Diff line number	Diff line
		@@ -20,3 +20,90 @@
		model = "Qualcomm Technologies, Inc. MSM 8996 v3.0";
		qcom,msm-id = <246 0x30000>;
		};

		&gfx_cpr {
		system-supply = <&pm8994_s1_corner>;
		qcom,cpr-enable;
		};

		&gfx_vreg {
		regulator-min-microvolt = <1>;
		regulator-max-microvolt = <7>;

		qcom,cpr-fuse-corners = <4>;
		qcom,cpr-fuse-combos = <2>;
		qcom,cpr-corners = <7>;

		qcom,cpr-corner-fmax-map = <2 3 5 7>;

		qcom,cpr-voltage-ceiling =
		<400000 670000 745000 825000 905000
		960000 1015000>;
		qcom,cpr-voltage-floor =
		<400000 520000 520000 520000 520000
		520000 520000>;

		qcom,system-voltage = <2 2 2 2 2 4 4>;

		qcom,corner-frequencies =
		<0 210000000 300000000 401800000
		510000000 549000000 624000000>;

		qcom,cpr-target-quotients =
		< 0 0 0 0 0 0 0 0
		0 0 0 0 0 0 0 0>,
		< 0 0 0 0 0 0 287 273
		425 426 443 453 0 0 0 0>,
		< 0 0 0 0 0 0 414 392
		584 576 608 612 0 0 0 0>,
		< 0 0 0 0 0 0 459 431
		684 644 692 679 0 0 0 0>,
		< 0 0 0 0 0 0 577 543
		798 768 823 810 0 0 0 0>,
		< 0 0 0 0 0 0 669 629
		886 864 924 911 0 0 0 0>,
		< 0 0 0 0 0 0 771 725
		984 970 1036 1024 0 0 0 0>;

		qcom,cpr-ro-scaling-factor =
		< 0 0 0 0 0 0 2035 1917
		1959 2131 2246 2253 0 0 0 0>,
		< 0 0 0 0 0 0 2035 1917
		1959 2131 2246 2253 0 0 0 0>,
		< 0 0 0 0 0 0 2035 1917
		1959 2131 2246 2253 0 0 0 0>,
		< 0 0 0 0 0 0 2035 1917
		1959 2131 2246 2253 0 0 0 0>,
		< 0 0 0 0 0 0 2035 1917
		1959 2131 2246 2253 0 0 0 0>,
		< 0 0 0 0 0 0 2035 1917
		1959 2131 2246 2253 0 0 0 0>,
		< 0 0 0 0 0 0 2035 1917
		1959 2131 2246 2253 0 0 0 0>;

		qcom,cpr-open-loop-voltage-fuse-adjustment =
		<30000 30000 30000 0>,
		<0 0 0 0>;
		qcom,cpr-closed-loop-voltage-adjustment =
		<0 30000 30000 30000 30000 0 0>,
		<0 30000 30000 30000 30000 0 0>;
		qcom,cpr-floor-to-ceiling-max-range =
		<0 70000 75000 80000 90000 95000 100000>;

		qcom,allow-voltage-interpolation;
		qcom,cpr-scaled-open-loop-voltage-as-ceiling;
		};

		&clock_gpu {
		compatible = "qcom,gpucc-8996-v3.0";
		qcom,gfx3d_clk_src_v2-opp-handle = <&msm_gpu>;
		qcom,gfxfreq-corner-v2 =
		< 0 0 0 >,
		< 133000000 3 4 >,
		< 210000000 3 4 >,
		< 300000000 3 4 >,
		< 401800000 4 5 >,
		< 510000000 5 5 >,
		< 549000000 6 7 >,
		< 624000000 7 7 >;
		};