1 files changed, 9 insertions, 3 deletions

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index e742118fcfd2..360b2daf54dd 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -266,7 +266,12 @@ static void __init omap4_init_voltages(void)
 
 static inline void omap_init_cpufreq(void)
 {
-        struct platform_device_info devinfo = { .name = "omap-cpufreq", };
+        struct platform_device_info devinfo = { };
+
+        if (!of_have_populated_dt())
+                devinfo.name = "omap-cpufreq";
+        else
+                devinfo.name = "cpufreq-cpu0";
         platform_device_register_full(&devinfo);
 }
 
@@ -300,10 +305,11 @@ int __init omap2_common_pm_late_init(void)
                 /* Smartreflex device init */
                 omap_devinit_smartreflex();
 
-                /* cpufreq dummy device instantiation */
-                omap_init_cpufreq();
         }
 
+        /* cpufreq dummy device instantiation */
+        omap_init_cpufreq();
+
 #ifdef CONFIG_SUSPEND
         suspend_set_ops(&omap_pm_ops);
 #endif