Merge "regulator: spm-regulator: fall back on SPMI write if msm_spm_set_vdd fails" (61b52bcb) · Commits · e / devices / android_kernel_sony_msm8994

drivers/regulator/spm-regulator.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -138,7 +138,8 @@ static int qpnp_fts2_set_mode(struct spm_vreg *vreg, u8 mode)
		static int _spm_regulator_set_voltage(struct regulator_dev *rdev)
		{
		struct spm_vreg *vreg = rdev_get_drvdata(rdev);
		int rc;
		bool spm_failed = false;
		int rc = 0;
		u8 reg;

		if (vreg->vlevel == vreg->last_set_vlevel)
		@@ -157,11 +158,13 @@ static int _spm_regulator_set_voltage(struct regulator_dev *rdev)
		/* Set voltage control register via SPM. */
		rc = msm_spm_set_vdd(vreg->cpu_num, vreg->vlevel);
		if (rc) {
		pr_err("%s: msm_spm_set_vdd failed %d\n",
		pr_err("%s: msm_spm_set_vdd failed, rc=%d; falling back on SPMI write\n",
		vreg->rdesc.name, rc);
		return rc;
		spm_failed = true;
		}
		} else {
		}

		if (unlikely(vreg->bypass_spm \|\| spm_failed)) {
		/* Set voltage control register via SPMI. */
		reg = vreg->vlevel;
		rc = spmi_ext_register_writel(vreg->spmi_dev->ctrl,
		@@ -169,7 +172,7 @@ static int _spm_regulator_set_voltage(struct regulator_dev *rdev)
		vreg->spmi_base_addr + QPNP_SMPS_REG_VOLTAGE_SETPOINT,
		&reg, 1);
		if (rc) {
		pr_err("%s: spmi_ext_register_writel failed %d\n",
		pr_err("%s: spmi_ext_register_writel failed, rc=%d\n",
		vreg->rdesc.name, rc);
		return rc;
		}