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

Commit dab0d727 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 IBB discharge resistor configuration for 8996 targets"

parents 9b2916af fd95edbf

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

+3 −0
Original line number Diff line number Diff line
@@ -382,6 +382,9 @@ 
&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

};



&ibb_regulator {

	qcom,qpnp-ibb-discharge-resistor = <32>;

};

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

+3 −0
Original line number Diff line number Diff line
@@ -589,6 +589,9 @@ 
&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

};



&ibb_regulator {

	qcom,qpnp-ibb-discharge-resistor = <32>;

};

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

+3 −0
Original line number Diff line number Diff line
@@ -318,6 +318,9 @@ 
&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

};



&ibb_regulator {

	qcom,qpnp-ibb-discharge-resistor = <32>;

};

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

+3 −0
Original line number Diff line number Diff line
@@ -367,6 +367,9 @@ 
&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

};



&ibb_regulator {

	qcom,qpnp-ibb-discharge-resistor = <32>;

};

drivers/regulator/qpnp-labibb-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -1303,7 +1303,7 @@ int qpnp_ibb_set_pd_strength(struct regulator *regulator, u32 strength) 
	labibb = regulator_get_drvdata(regulator);



	mutex_lock(&(labibb->ibb_vreg.ibb_mutex));

	rc = qpnp_labibb_masked_write(labibb, labibb->lab_base +

	rc = qpnp_labibb_masked_write(labibb, labibb->ibb_base +

				REG_IBB_PD_CTL,

				IBB_PD_CTL_STRENGTH_MASK,

				val,
@@ -1337,7 +1337,7 @@ int qpnp_ibb_pd_enable_ctl(struct regulator *regulator, bool enable) 
	labibb = regulator_get_drvdata(regulator);



	mutex_lock(&(labibb->ibb_vreg.ibb_mutex));

	rc = qpnp_labibb_masked_write(labibb, labibb->lab_base +

	rc = qpnp_labibb_masked_write(labibb, labibb->ibb_base +

				REG_IBB_PD_CTL,

				IBB_PD_CTL_EN_MASK,

				val,