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

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

Merge "regulator: qpnp-labibb-regulator: fix the delay setting for LAB/IBB"

parents 2ce2e094 b72d5b8c

drivers/regulator/qpnp-labibb-regulator.c

+2 −6
Original line number Diff line number Diff line
@@ -1026,13 +1026,11 @@ static int qpnp_lab_regulator_set_voltage(struct regulator_dev *rdev, 
		return -EINVAL;

	}



	val |= LAB_VOLTAGE_OVERRIDE_EN;



	rc = qpnp_labibb_masked_write(labibb, labibb->lab_base +

				REG_LAB_VOLTAGE,

				LAB_VOLTAGE_SET_MASK |

				LAB_VOLTAGE_OVERRIDE_EN,

				val,

				val | LAB_VOLTAGE_OVERRIDE_EN,

				1);



	if (rc) {
@@ -1910,13 +1908,11 @@ static int qpnp_ibb_regulator_set_voltage(struct regulator_dev *rdev, 
		return -EINVAL;

	}



	val |= IBB_VOLTAGE_OVERRIDE_EN;



	rc = qpnp_labibb_masked_write(labibb, labibb->ibb_base +

				REG_IBB_VOLTAGE,

				IBB_VOLTAGE_SET_MASK |

				IBB_VOLTAGE_OVERRIDE_EN,

				val,

				val | IBB_VOLTAGE_OVERRIDE_EN,

				1);



	if (rc) {