2 files changed, 23 insertions, 5 deletions

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 673a4c1d1d76..8d15f9ae19ff 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -265,6 +265,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())
@@ -294,6 +300,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
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index ad7549c13ed2..0279d18a57f9 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -25,6 +25,7 @@
 #include <linux/opp.h>
 #include <linux/cpu.h>
 #include <linux/module.h>
+#include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 
 #include <asm/smp_plat.h>
@@ -243,7 +244,7 @@ static struct cpufreq_driver omap_driver = {
         .attr           = omap_cpufreq_attr,
 };
 
-static int __init omap_cpufreq_init(void)
+static int omap_cpufreq_probe(struct platform_device *pdev)
 {
         mpu_dev = get_cpu_device(0);
         if (!mpu_dev) {
@@ -271,12 +272,20 @@ static int __init omap_cpufreq_init(void)
         return cpufreq_register_driver(&omap_driver);
 }
 
-static void __exit omap_cpufreq_exit(void)
+static int omap_cpufreq_remove(struct platform_device *pdev)
 {
-        cpufreq_unregister_driver(&omap_driver);
+        return cpufreq_unregister_driver(&omap_driver);
 }
 
+static struct platform_driver omap_cpufreq_platdrv = {
+        .driver = {
+                .name   = "omap-cpufreq",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = omap_cpufreq_probe,
+        .remove         = omap_cpufreq_remove,
+};
+module_platform_driver(omap_cpufreq_platdrv);
+
 MODULE_DESCRIPTION("cpufreq driver for OMAP SoCs");
 MODULE_LICENSE("GPL");
-module_init(omap_cpufreq_init);
-module_exit(omap_cpufreq_exit);