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

Commit 64669cd6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ARM: dts: disable CPUSS LDO mode on msm8996v2 platform""

parents b0c3921d bc4b78cc

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

+4 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ 
		<0 0 0 0 0>,

		<0 0 0 0 0>,

		<0 0 0 0 0>;



	/delete-property/ qcom,ldo-disable;

};



&apc0_cbf_vreg {
@@ -237,6 +239,8 @@ 
		<0 0 0 20000 0>,

		<0 0 0 0 0>,

		<0 0 0 0 0>;



	/delete-property/ qcom,ldo-disable;

};



&gfx_cpr {

drivers/cpuidle/lpm-levels-of.c

+0 −2
Original line number Diff line number Diff line
@@ -775,8 +775,6 @@ struct lpm_cluster *parse_cluster(struct device_node *node, 
	else

		c->last_level = c->nlevels-1;



	c->last_level = c->nlevels-1;



	return c;



failed_parse_cluster:

drivers/regulator/kryo-regulator.c

+6 −0
Original line number Diff line number Diff line
@@ -916,6 +916,12 @@ static int kryo_regulator_lpm_resume(struct kryo_regulator *kvreg) 
	kvreg->lpm_exit_count++;

	spin_unlock_irqrestore(&kvreg->slock, flags);



	if (kvreg->lpm_exit_count != kvreg->lpm_enter_count) {

		kvreg_err(kvreg, "LPM entry/exit counter mismatch, this is not expected: enter=%lx exit=%lx\n",

			  kvreg->lpm_enter_count, kvreg->lpm_exit_count);

		BUG_ON(1);

	}



	return NOTIFY_OK;

}