Commit 92d51856 authored by Nishanth Menon's avatar Nishanth Menon Committed by Tony Lindgren

ARM: OMAP3+: do not register non-dt OPP tables for device tree boot

OMAP3+ supports both device tree and non-device tree boot.
Device tree bindings for OMAP3+ is supposed to be added via dts following:
Documentation/devicetree/bindings/power/opp.txt

Since we now have device tree entries for OMAP3+ cpu OPPs,
The current code wrongly adds duplicate OPPs. So, dont register OPPs
when booting using device tree.
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 06ff74fd
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h>
#include <linux/opp.h> #include <linux/opp.h>
#include <linux/cpu.h> #include <linux/cpu.h>
...@@ -40,6 +41,9 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def, ...@@ -40,6 +41,9 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def,
{ {
int i, r; int i, r;
if (of_have_populated_dt())
return -EINVAL;
if (!opp_def || !opp_def_size) { if (!opp_def || !opp_def_size) {
pr_err("%s: invalid params!\n", __func__); pr_err("%s: invalid params!\n", __func__);
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment