Merge tag 'v3.11-rc2' into patchwork

[~andy/linux] / arch / arm / mach-omap2 / pm.c

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index dec553349ae2db5d59c3a9cfaf51c0277abeab57..e742118fcfd2b69adc367057e6f17670a5136903 100644 (file)
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -264,6 +264,12 @@ static void __init omap4_init_voltages(void)
        omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", "iva");
 }
 
+static inline void omap_init_cpufreq(void)
+{
+       struct platform_device_info devinfo = { .name = "omap-cpufreq", };
+       platform_device_register_full(&devinfo);
+}
+
 static int __init omap2_common_pm_init(void)
 {
        if (!of_have_populated_dt())
@@ -293,6 +299,9 @@ int __init omap2_common_pm_late_init(void)
 
                /* Smartreflex device init */
                omap_devinit_smartreflex();
+
+               /* cpufreq dummy device instantiation */
+               omap_init_cpufreq();
        }
 
 #ifdef CONFIG_SUSPEND