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

Commit c116fa43 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: Fix clock for 720p@240fps usecase"

parents 2e28fde0 fc60de36
Loading
Loading
Loading
Loading
+7 −8
Original line number Diff line number Diff line
@@ -669,11 +669,10 @@
	qcom,load-freq-tbl =
		/* Encoders */
		<1105920 533000000 0x55555555>, /* 4kx2304@30 */ /*TURBO*/
		< 979200 444000000 0x55555555>, /* 1080p@120,1440p@60,
		<1036800 444000000 0x55555555>, /* 720p@240, 1080p@120,1440p@60,
						 * UHD@30 */ /*NOMINAL*/
		< 939700 355200000 0x55555555>, /* 4kx2304@24 */ /*SVSL1*/
		< 489600 269330000 0x55555555>, /* 1080p@60, 2560x1440@30 */
						/* SVS */
		< 829440 355200000 0x55555555>, /* UHD/4096x2160@30 SVSL1 */
		< 489600 269330000 0x55555555>, /* 1080p@60 SVS */
		< 432000 200000000 0x55555555>, /* 720p@120, 1080p@30 */
						/* SVS2 */

@@ -685,7 +684,7 @@
		<1675472 355200000 0xffffffff>, /* 4kx2304@44 */ /*SVSL1*/
		<1105920 269330000 0xffffffff>, /* UHD/4k2304@30, 1080p@120 */
						/* SVS */
		< 864000 200000000 0xffffffff>; /* 720p@240, 1080p@60 */
		< 829440 200000000 0xffffffff>; /* 720p@120, 1080p@60 */
						/* SVS2 */

	qcom,imem-ab-tbl =
@@ -701,11 +700,11 @@
		<1728000 1728000 2211840 0x3f00000c>,
		/* Encoder */
		/* Load > Nominal, Nominal <-> Turbo Eg. 4kx2304@30 */
		<972000 972000 1105920 0x04000004>,
		<1036800 1036800 1105920 0x04000004>,
		/* Load > SVSL1, SVSL1<-> Nominal Eg. 3840x2160@30 */
		<939700 939700  972000 0x04000004>,
		< 829440  829440 1036800 0x04000004>,
		/* Load > SVS , SVS <-> SVSL1 Eg. 4kx2304@24 */
		<489600  489600  939700 0x04000004>;
		< 489600  489600  829440 0x04000004>;

	qcom,dcvs-limit = /* Min Frame size, Min MBs/sec */
		<32400 30>, /* Encoder 3840x2160@30 */