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

Commit 7aa5285e authored by Viresh Kumar's avatar Viresh Kumar Committed by Alex Shi
Browse files

imx6q: free OPP table created during ->init() 



OPP layer now supports freeing of OPPs and we should free them once they aren't
useful anymore.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit cc87b8a8e94d840863334151f3525fd286c9ae23)
Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent 7244593b

drivers/cpufreq/imx6q-cpufreq.c

+10 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ static struct clk *step_clk; 
static struct clk *pll2_pfd2_396m_clk;



static struct device *cpu_dev;

static bool free_opp;

static struct cpufreq_frequency_table *freq_table;

static unsigned int transition_latency;
@@ -207,11 +208,14 @@ static int imx6q_cpufreq_probe(struct platform_device *pdev) 
			goto put_reg;

		}



		/* Because we have added the OPPs here, we must free them */

		free_opp = true;



		num = dev_pm_opp_get_opp_count(cpu_dev);

		if (num < 0) {

			ret = num;

			dev_err(cpu_dev, "no OPP table is found: %d\n", ret);

			goto put_reg;

			goto out_free_opp;

		}

	}
@@ -306,6 +310,9 @@ soc_opp_out: 


free_freq_table:

	dev_pm_opp_free_cpufreq_table(cpu_dev, &freq_table);

out_free_opp:

	if (free_opp)

		of_free_opp_table(cpu_dev);

put_reg:

	if (!IS_ERR(arm_reg))

		regulator_put(arm_reg);
@@ -332,6 +339,8 @@ 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);

	if (free_opp)

		of_free_opp_table(cpu_dev);

	regulator_put(arm_reg);

	if (!IS_ERR(pu_reg))

		regulator_put(pu_reg);