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

Commit 54cad2fc authored by Irina Tirdea's avatar Irina Tirdea Committed by Rafael J. Wysocki
Browse files

cpufreq: imx6q: Fix handling EPROBE_DEFER from regulator 



If there are any errors in getting the cpu0 regulators, the driver returns
-ENOENT. In case the regulators are not yet available, the devm_regulator_get
calls will return -EPROBE_DEFER, so that the driver can be probed later.
If we return -ENOENT, the driver will fail its initialization and will
not try to probe again (when the regulators become available).

Return the actual error received from regulator_get in probe. Print a
differentiated message in case we need to probe the device later and
in case we actually failed. Also add a message to inform when the
driver has been successfully registered.

Signed-off-by: default avatarIrina Tirdea <irina.tirdea@nxp.com>
Signed-off-by: default avatarLeonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: default avatarLucas Stach <l.stach@pengutronix.de>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c97ad0fc

drivers/cpufreq/imx6q-cpufreq.c

+7 −0
Original line number Diff line number Diff line
@@ -222,6 +222,13 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) 
	arm_reg = regulator_get(cpu_dev, "arm");

	pu_reg = regulator_get_optional(cpu_dev, "pu");

	soc_reg = regulator_get(cpu_dev, "soc");

	if (PTR_ERR(arm_reg) == -EPROBE_DEFER ||

			PTR_ERR(soc_reg) == -EPROBE_DEFER ||

			PTR_ERR(pu_reg) == -EPROBE_DEFER) {

		ret = -EPROBE_DEFER;

		dev_dbg(cpu_dev, "regulators not ready, defer\n");

		goto put_reg;

	}

	if (IS_ERR(arm_reg) || IS_ERR(soc_reg)) {

		dev_err(cpu_dev, "failed to get regulators\n");

		ret = -ENOENT;