3 files changed, 39 insertions, 33 deletions

diff --git a/arch/arm/mach-davinci/cpufreq.c b/arch/arm/mach-davinci/cpufreq.c
index 8c8c07b12d8..d3fa6de1e20 100644
--- a/arch/arm/mach-davinci/cpufreq.c
+++ b/arch/arm/mach-davinci/cpufreq.c
@@ -127,6 +127,13 @@ static int __init davinci_cpu_init(struct cpufreq_policy *policy)
         if (policy->cpu != 0)
                 return -EINVAL;
 
+        /* Finish platform specific initialization */
+        if (pdata->init) {
+                result = pdata->init();
+                if (result)
+                        return result;
+        }
+
         policy->cur = policy->min = policy->max = davinci_getspeed(0);
 
         if (freq_table) {
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 0f27c93545b..717806c6cef 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -907,8 +907,39 @@ static struct cpufreq_frequency_table da850_freq_table[] = {
         },
 };
 
+#ifdef CONFIG_REGULATOR
+static struct regulator *cvdd;
+
+static int da850_set_voltage(unsigned int index)
+{
+        struct da850_opp *opp;
+
+        if (!cvdd)
+                return -ENODEV;
+
+        opp = (struct da850_opp *) da850_freq_table[index].index;
+
+        return regulator_set_voltage(cvdd, opp->cvdd_min, opp->cvdd_max);
+}
+
+static int da850_regulator_init(void)
+{
+        cvdd = regulator_get(NULL, "cvdd");
+        if (WARN(IS_ERR(cvdd), "Unable to obtain voltage regulator for CVDD;"
+                                        " voltage scaling unsupported\n")) {
+                return PTR_ERR(cvdd);
+        }
+
+        return 0;
+}
+#endif
+
 static struct davinci_cpufreq_config cpufreq_info = {
         .freq_table = &da850_freq_table[0],
+#ifdef CONFIG_REGULATOR
+        .init = da850_regulator_init,
+        .set_voltage = da850_set_voltage,
+#endif
 };
 
 static struct platform_device da850_cpufreq_device = {
@@ -997,39 +1028,6 @@ static int da850_round_armrate(struct clk *clk, unsigned long rate)
 }
 #endif
 
-#ifdef CONFIG_REGULATOR
-static struct regulator *cvdd;
-
-static int da850_set_voltage(unsigned int index)
-{
-        struct da850_opp *opp;
-
-        if (!cvdd)
-                return -ENODEV;
-
-        opp = (struct da850_opp *) da850_freq_table[index].index;
-
-        return regulator_set_voltage(cvdd, opp->cvdd_min, opp->cvdd_max);
-}
-
-static int __init da850_regulator_init(void)
-{
-        int ret = 0;
-
-        cvdd = regulator_get(NULL, "cvdd");
-        if (WARN(IS_ERR(cvdd), "Unable to obtain voltage regulator for CVDD;"
-                                        " voltage scaling unsupported\n")) {
-                ret = PTR_ERR(cvdd);
-                goto out;
-        }
-
-        cpufreq_info.set_voltage = da850_set_voltage;
-
-out:
-        return ret;
-}
-device_initcall(da850_regulator_init);
-#endif
 
 static struct davinci_soc_info davinci_soc_info_da850 = {
         .io_desc                = da850_io_desc,
diff --git a/arch/arm/mach-davinci/include/mach/cpufreq.h b/arch/arm/mach-davinci/include/mach/cpufreq.h
index 442bdea4463..3c089cfb6cd 100644
--- a/arch/arm/mach-davinci/include/mach/cpufreq.h
+++ b/arch/arm/mach-davinci/include/mach/cpufreq.h
@@ -20,6 +20,7 @@
 struct davinci_cpufreq_config {
         struct cpufreq_frequency_table *freq_table;
         int (*set_voltage) (unsigned int index);
+        int (*init) (void);
 };
 
 #endif