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

Commit 22d0628a authored by Anson Huang's avatar Anson Huang Committed by Rafael J. Wysocki
Browse files

cpufreq: imx6: remove pu regulator dependency for SOCs with no PU regulator 



PU regulator is not a necessary regulator for cpufreq, not all
i.MX6 SoCs have PU regulator, only if SOC has PU regulator, then its
voltage must be equal to SOC regulator, so remove the dependency
to support i.MX6SX which has no PU regulator.

Signed-off-by: default avatarAnson Huang <b20788@freescale.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarShawn Guo <shawn.guo@freescale.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 78e27086

drivers/cpufreq/imx6q-cpufreq.c

+21 −14
Original line number Diff line number Diff line
@@ -66,11 +66,13 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index) 


	/* scaling up?  scale voltage before frequency */

	if (new_freq > old_freq) {

		if (!IS_ERR(pu_reg)) {

			ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0);

			if (ret) {

				dev_err(cpu_dev, "failed to scale vddpu up: %d\n", ret);

				return ret;

			}

		}

		ret = regulator_set_voltage_tol(soc_reg, imx6_soc_volt[index], 0);

		if (ret) {

			dev_err(cpu_dev, "failed to scale vddsoc up: %d\n", ret);
@@ -121,12 +123,14 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index) 
			dev_warn(cpu_dev, "failed to scale vddsoc down: %d\n", ret);

			ret = 0;

		}

		if (!IS_ERR(pu_reg)) {

			ret = regulator_set_voltage_tol(pu_reg, imx6_soc_volt[index], 0);

			if (ret) {

				dev_warn(cpu_dev, "failed to scale vddpu down: %d\n", ret);

				ret = 0;

			}

		}

	}



	return 0;

}
@@ -182,9 +186,9 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) 
	}



	arm_reg = regulator_get(cpu_dev, "arm");

	pu_reg = regulator_get(cpu_dev, "pu");

	pu_reg = regulator_get_optional(cpu_dev, "pu");

	soc_reg = regulator_get(cpu_dev, "soc");

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

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

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

		ret = -ENOENT;

		goto put_reg;
@@ -268,9 +272,11 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) 
	ret = regulator_set_voltage_time(soc_reg, imx6_soc_volt[0], imx6_soc_volt[num - 1]);

	if (ret > 0)

		transition_latency += ret * 1000;

	if (!IS_ERR(pu_reg)) {

		ret = regulator_set_voltage_time(pu_reg, imx6_soc_volt[0], imx6_soc_volt[num - 1]);

		if (ret > 0)

			transition_latency += ret * 1000;

	}



	/*

	 * OPP is maintained in order of increasing frequency, and
@@ -327,6 +333,7 @@ static int imx6q_cpufreq_remove(struct platform_device *pdev) 
	cpufreq_unregister_driver(&imx6q_cpufreq_driver);

	dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);

	regulator_put(arm_reg);

	if (!IS_ERR(pu_reg))

		regulator_put(pu_reg);

	regulator_put(soc_reg);

	clk_put(arm_clk);