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

Commit 658a0f5f 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: modify VDD_GFX CPR voltage adjustments for msmcobalt v2"

parents 42532224 6a53448a

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

+12 −7
Original line number Diff line number Diff line
@@ -540,12 +540,17 @@ 
	qcom,cpr-corner-fmax-map = <1 3 5 8>;



	qcom,cpr-voltage-ceiling =

		<656000  716000  772000  880000  908000

		 948000 1016000 1088000>;

		<656000 716000 772000 880000 908000 948000 1016000 1088000>,

		<660000 724000 772000 832000 916000 968000 1024000 1024000>,

		<660000 724000 772000 832000 916000 968000 1024000 1024000>,

		<660000 724000 772000 832000 916000 968000 1024000 1024000>,

		<660000 724000 772000 832000 916000 968000 1024000 1024000>,

		<660000 724000 772000 832000 916000 968000 1024000 1024000>,

		<660000 724000 772000 832000 916000 968000 1024000 1024000>,

		<660000 724000 772000 832000 916000 968000 1024000 1024000>;



	qcom,cpr-voltage-floor =

		<516000  516000  532000  584000  632000

		 672000  712000  756000>;

		<516000 516000 532000 584000 632000 672000 712000 756000>;



	qcom,mem-acc-voltage = <1 1 1 2 2 2 2 2>;
@@ -590,11 +595,11 @@ 
		    0    0 3487    0 3280 1896 1874    0>;



	qcom,cpr-open-loop-voltage-fuse-adjustment =

		<   72000        0        0        0>;

		<  100000        0        0        0>;



	qcom,cpr-closed-loop-voltage-adjustment =

		<   65000    26000     8000        0

			0        0        0        0>;

		<   96000    18000     4000        0

			0    13000     9000        0>;



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

	       <50000 50000 50000 50000 50000 50000 70000 70000>;

drivers/regulator/cpr3-mmss-regulator.c

+12 −1
Original line number Diff line number Diff line
@@ -217,6 +217,14 @@ msmcobalt_v1_rev0_mmss_fuse_ref_volt[MSM8996_MMSS_FUSE_CORNERS] = { 
};



static const int msmcobalt_v2_mmss_fuse_ref_volt[MSM8996_MMSS_FUSE_CORNERS] = {

	516000,

	628000,

	752000,

	924000,

};



static const int

msmcobalt_v2_rev0_mmss_fuse_ref_volt[MSM8996_MMSS_FUSE_CORNERS] = {

	616000,

	740000,

	828000,
@@ -759,7 +767,10 @@ static int cpr3_msm8996_mmss_calculate_open_loop_voltages( 
		goto done;

	}



	if (vreg->thread->ctrl->soc_revision == MSMCOBALT_V2_SOC_ID)

	if (vreg->thread->ctrl->soc_revision == MSMCOBALT_V2_SOC_ID

	    && fuse->cpr_fusing_rev == 0)

		ref_volt = msmcobalt_v2_rev0_mmss_fuse_ref_volt;

	else if (vreg->thread->ctrl->soc_revision == MSMCOBALT_V2_SOC_ID)

		ref_volt = msmcobalt_v2_mmss_fuse_ref_volt;

	else if (vreg->thread->ctrl->soc_revision == MSMCOBALT_V1_SOC_ID

	    && fuse->cpr_fusing_rev == 0)