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

Commit b5ca255f authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "regulator: qpnp-lcdb: Correct the get_voltage calculation"

parents ea97a184 9837ac38

arch/arm64/boot/dts/qcom/pm6150l.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -166,6 +166,13 @@ 
				regulator-min-microvolt = <4000000>;

				regulator-max-microvolt = <6000000>;

			};



			lcdb_bst_vreg: bst {

				label = "bst";

				regulator-name = "lcdb_bst";

				regulator-min-microvolt = <4700000>;

				regulator-max-microvolt = <6275000>;

			};

		};



		flash_led: qcom,leds@d300 {

arch/arm64/boot/dts/qcom/pm8150l.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -161,6 +161,13 @@ 
				regulator-min-microvolt = <4000000>;

				regulator-max-microvolt = <6000000>;

			};



			lcdb_bst_vreg: bst {

				label = "bst";

				regulator-name = "lcdb_bst";

				regulator-min-microvolt = <4700000>;

				regulator-max-microvolt = <6275000>;

			};

		};



		flash_led: qcom,leds@d300 {

drivers/regulator/qpnp-lcdb-regulator.c

+2 −1
Original line number Diff line number Diff line
@@ -1148,6 +1148,7 @@ static int qpnp_lcdb_get_voltage(struct qpnp_lcdb *lcdb, 
		return rc;

	}



	val &= SET_OUTPUT_VOLTAGE_MASK;

	if (val < VOLTAGE_STEP_50MV_OFFSET) {

		*voltage_mv = VOLTAGE_MIN_STEP_100_MV +

				(val * VOLTAGE_STEP_100_MV);
@@ -1823,7 +1824,7 @@ static int qpnp_lcdb_init_bst(struct qpnp_lcdb *lcdb) 


		if (lcdb->bst.pd_strength != -EINVAL) {

			rc = qpnp_lcdb_masked_write(lcdb, lcdb->base +

				LCDB_NCP_PD_CTL_REG, BOOST_PD_STRENGTH_BIT,

				LCDB_BST_PD_CTL_REG, BOOST_PD_STRENGTH_BIT,

				lcdb->bst.pd_strength ?

				BOOST_PD_STRENGTH_BIT : 0);

			if (rc < 0) {