Merge tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / opp.c

diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c
index ec21e6eb03e133be1c8b1ff2a4733d0f34052abc..a358a07e18f26ec51df2f2615e8b3466f4d94a93 100644 (file)
--- a/arch/arm/mach-omap2/opp.c
+++ b/arch/arm/mach-omap2/opp.c
@@ -17,6 +17,7 @@
  * GNU General Public License for more details.
  */
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/pm_opp.h>
 #include <linux/cpu.h>
 
@@ -40,6 +41,9 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def,
 {
        int i, r;
 
+       if (of_have_populated_dt())
+               return -EINVAL;
+
        if (!opp_def || !opp_def_size) {
                pr_err("%s: invalid params!\n", __func__);
                return -EINVAL;