Merge "regulator: qpnp-labibb-regulator: fix configuring MODULE_RDY of LAB and IBB" (8e3ca908) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/regulator/qpnp-labibb-regulator.c

+60 −43

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@
		#define IBB_RING_SUPPRESSION_CTL_EN BIT(7)

		/* REG_IBB_MODULE_RDY */
		#define REG_IBB_MODULE_RDY_EN BIT(7)
		#define IBB_MODULE_RDY_EN BIT(7)

		/* REG_IBB_ENABLE_CTL */
		#define IBB_ENABLE_CTL_EN BIT(7)
		@@ -789,20 +789,6 @@ static int qpnp_lab_dt_init(struct qpnp_labibb *labibb,
		return rc;
		}

		if (labibb->mode != QPNP_LABIBB_STANDALONE_MODE) {
		val = LAB_MODULE_RDY_EN;

		rc = qpnp_labibb_write(labibb, labibb->lab_base +
		REG_LAB_MODULE_RDY, &val, 1);

		if (rc) {
		pr_err("qpnp_lab_dt_init write register %x failed rc = %d\n",
		REG_LAB_MODULE_RDY, rc);
		return rc;
		}

		}

		return rc;
		}

		@@ -1082,14 +1068,6 @@ static int register_qpnp_lab_regulator(struct qpnp_labibb *labibb,
		return -ENOMEM;
		}

		rc = qpnp_labibb_read(labibb, &ibb_en_rdy_val,
		labibb->lab_base + REG_LAB_IBB_EN_RDY, 1);
		if (rc) {
		pr_err("qpnp_lab_read register %x failed rc = %d\n",
		REG_LAB_IBB_EN_RDY, rc);
		return rc;
		}

		rc = of_property_read_u32(of_node, "qcom,qpnp-lab-min-voltage",
		&(labibb->lab_vreg.min_volt));
		if (rc < 0) {
		@@ -1113,6 +1091,14 @@ static int register_qpnp_lab_regulator(struct qpnp_labibb *labibb,
		return rc;
		}

		rc = qpnp_labibb_read(labibb, &ibb_en_rdy_val,
		labibb->lab_base + REG_LAB_IBB_EN_RDY, 1);
		if (rc) {
		pr_err("qpnp_lab_read register %x failed rc = %d\n",
		REG_LAB_IBB_EN_RDY, rc);
		return rc;
		}

		if (ibb_en_rdy_val == LAB_IBB_EN_RDY_EN) {
		rc = qpnp_labibb_read(labibb, &val,
		labibb->lab_base + REG_LAB_LCD_AMOLED_SEL, 1);
		@@ -1182,6 +1168,28 @@ static int register_qpnp_lab_regulator(struct qpnp_labibb *labibb,
		}
		}

		rc = qpnp_labibb_read(labibb, &val,
		labibb->lab_base + REG_LAB_MODULE_RDY, 1);
		if (rc) {
		pr_err("qpnp_lab_read read register %x failed rc = %d\n",
		REG_LAB_MODULE_RDY, rc);
		return rc;
		}

		if (labibb->mode != QPNP_LABIBB_STANDALONE_MODE &&
		!(val & LAB_MODULE_RDY_EN)) {
		val = LAB_MODULE_RDY_EN;

		rc = qpnp_labibb_write(labibb, labibb->lab_base +
		REG_LAB_MODULE_RDY, &val, 1);

		if (rc) {
		pr_err("qpnp_lab_dt_init write register %x failed rc = %d\n",
		REG_LAB_MODULE_RDY, rc);
		return rc;
		}
		}

		if (init_data->constraints.name) {
		rdesc = &(labibb->lab_vreg.rdesc);
		rdesc->owner = THIS_MODULE;
		@@ -1796,18 +1804,6 @@ static int qpnp_ibb_dt_init(struct qpnp_labibb *labibb,
		pr_err("qpnp_ibb_masked_write write register %x failed rc = %d\n",
		REG_IBB_VOLTAGE, rc);

		if (labibb->mode != QPNP_LABIBB_STANDALONE_MODE) {
		val = REG_IBB_MODULE_RDY_EN;

		rc = qpnp_labibb_write(labibb, labibb->ibb_base +
		REG_IBB_MODULE_RDY, &val, 1);

		if (rc) {
		pr_err("qpnp_ibb_dt_init write register %x failed rc = %d\n",
		REG_IBB_MODULE_RDY, rc);
		return rc;
		}
		}

		return rc;
		}
		@@ -1964,14 +1960,6 @@ static int register_qpnp_ibb_regulator(struct qpnp_labibb *labibb,
		return -ENOMEM;
		}

		rc = qpnp_labibb_read(labibb, &val,
		labibb->ibb_base + REG_IBB_ENABLE_CTL, 1);
		if (rc) {
		pr_err("qpnp_ibb_read register %x failed rc = %d\n",
		REG_IBB_ENABLE_CTL, rc);
		return rc;
		}

		rc = of_property_read_u32(of_node, "qcom,qpnp-ibb-min-voltage",
		&(labibb->ibb_vreg.min_volt));
		if (rc < 0) {
		@@ -2003,6 +1991,14 @@ static int register_qpnp_ibb_regulator(struct qpnp_labibb *labibb,
		return rc;
		}

		rc = qpnp_labibb_read(labibb, &val,
		labibb->ibb_base + REG_IBB_ENABLE_CTL, 1);
		if (rc) {
		pr_err("qpnp_ibb_read register %x failed rc = %d\n",
		REG_IBB_ENABLE_CTL, rc);
		return rc;
		}

		if (val != 0) {
		rc = qpnp_labibb_read(labibb, &val,
		labibb->ibb_base + REG_IBB_LCD_AMOLED_SEL, 1);
		@@ -2075,6 +2071,27 @@ static int register_qpnp_ibb_regulator(struct qpnp_labibb *labibb,
		return rc;
		}
		}
		rc = qpnp_labibb_read(labibb, &val,
		labibb->ibb_base + REG_IBB_MODULE_RDY, 1);
		if (rc) {
		pr_err("qpnp_ibb_read read register %x failed rc = %d\n",
		REG_IBB_MODULE_RDY, rc);
		return rc;
		}

		if (labibb->mode != QPNP_LABIBB_STANDALONE_MODE &&
		!(val & IBB_MODULE_RDY_EN)) {
		val = IBB_MODULE_RDY_EN;

		rc = qpnp_labibb_write(labibb, labibb->ibb_base +
		REG_IBB_MODULE_RDY, &val, 1);

		if (rc) {
		pr_err("qpnp_ibb_dt_init write register %x failed rc = %d\n",
		REG_IBB_MODULE_RDY, rc);
		return rc;
		}
		}

		if (init_data->constraints.name) {
		rdesc = &(labibb->ibb_vreg.rdesc);