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

Commit 9b30a506 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 parsing of initial voltages"

parents d4297bae 9c82f22f

drivers/regulator/qpnp-labibb-regulator.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1141,7 +1141,7 @@ static int register_qpnp_lab_regulator(struct qpnp_labibb *labibb, 
					LAB_VOLTAGE_SET_MASK) *

					LAB_VOLTAGE_SET_MASK) *

					labibb->lab_vreg.step_size +

					labibb->lab_vreg.step_size +

					labibb->lab_vreg.min_volt;

					labibb->lab_vreg.min_volt;

		} else if (labibb->mode == QPNP_LABIBB_AMOLED_MODE) {

		} else if (labibb->mode == QPNP_LABIBB_LCD_MODE) {

			rc = of_property_read_u32(of_node,

			rc = of_property_read_u32(of_node,

				"qcom,qpnp-lab-init-lcd-voltage",

				"qcom,qpnp-lab-init-lcd-voltage",

				&(labibb->lab_vreg.curr_volt));

				&(labibb->lab_vreg.curr_volt));
@@ -2030,7 +2030,7 @@ static int register_qpnp_ibb_regulator(struct qpnp_labibb *labibb, 
				(val & IBB_VOLTAGE_SET_MASK) *

				(val & IBB_VOLTAGE_SET_MASK) *

				labibb->ibb_vreg.step_size +

				labibb->ibb_vreg.step_size +

				labibb->ibb_vreg.min_volt;

				labibb->ibb_vreg.min_volt;

		} else if (labibb->mode == QPNP_LABIBB_AMOLED_MODE) {

		} else if (labibb->mode == QPNP_LABIBB_LCD_MODE) {

			rc = of_property_read_u32(of_node,

			rc = of_property_read_u32(of_node,

				"qcom,qpnp-ibb-init-lcd-voltage",

				"qcom,qpnp-ibb-init-lcd-voltage",

				&(labibb->ibb_vreg.curr_volt));

				&(labibb->ibb_vreg.curr_volt));