diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-09-02 18:22:23 -0700 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-09-29 15:22:00 +0200 |
| commit | f36f1a8ab8be219bfec08ba4996211c2fe4e31be (patch) | |
| tree | 0e33aad0fb8273c3cc7062d19be10102e88ce71f | |
| parent | 8cb4656dee95b61c9d37283a81d7e733da1fcd9f (diff) | |
cpufreq: imx7: don't support OPP table from platform data
Remove check if a OPP table has been supplied already (e.g. via
platform data). i.MX 7 always uses OPP tables from device tree
hence this check is superfluous. This also gets rid of the
following error message:
cpu cpu0: dev_pm_opp_get_opp_count: device OPP not found (-19)
Note: There is no i.MX 7 specific cpufreq driver upstream hence
this issue won't appear in newer kernels.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | drivers/cpufreq/imx7-cpufreq.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/cpufreq/imx7-cpufreq.c b/drivers/cpufreq/imx7-cpufreq.c index ca5d38fff080..803a44db5a27 100644 --- a/drivers/cpufreq/imx7-cpufreq.c +++ b/drivers/cpufreq/imx7-cpufreq.c @@ -198,23 +198,16 @@ static int imx7d_cpufreq_probe(struct platform_device *pdev) goto put_node; } - /* We expect an OPP table supplied by platform. - * Just incase the platform did not supply the OPP - * table, it will try to get it. - */ + ret = of_init_opp_table(cpu_dev); + if (ret < 0) { + dev_err(cpu_dev, "failed to init OPP table: %d\n", ret); + goto put_node; + } num = dev_pm_opp_get_opp_count(cpu_dev); if (num < 0) { - ret = of_init_opp_table(cpu_dev); - if (ret < 0) { - dev_err(cpu_dev, "failed to init OPP table: %d\n", ret); - goto put_node; - } - 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_node; - } + ret = num; + dev_err(cpu_dev, "no OPP table is found: %d\n", ret); + goto put_node; } ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table); |