[PM-WIP_CPUFREQ][PATCH V3 3/8] OMAP2+: cpufreq: use opp/clk_*cpufreq_table based on silicon

[Nishanth Menon]

OMAP2 is the only family using clk_[init|exit]_cpufreq_table, while
OMAP3+ use OPP table to generate and release the cpufreq tables.

Hence use a flag to mark which API to use for allocating and freeing
the tables.

Signed-off-by: Nishanth Menon <n...@ti.com>
---
 arch/arm/mach-omap2/omap2plus-cpufreq.c |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c 
b/arch/arm/mach-omap2/omap2plus-cpufreq.c
index 2d4e9d7..dbbf8b2 100644
--- a/arch/arm/mach-omap2/omap2plus-cpufreq.c
+++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c
@@ -44,6 +44,7 @@ static struct cpufreq_frequency_table *freq_table;
 static struct clk *mpu_clk;
 static char *mpu_clk_name;
 static struct device *mpu_dev;
+static bool use_opp;
 
 static int omap_verify_speed(struct cpufreq_policy *policy)
 {
@@ -166,7 +167,10 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy 
*policy)
                return -EINVAL;
 
        policy->cur = policy->min = policy->max = omap_getspeed(policy->cpu);
-       opp_init_cpufreq_table(mpu_dev, &freq_table);
+       if (use_opp)
+               opp_init_cpufreq_table(mpu_dev, &freq_table);
+       else
+               clk_init_cpufreq_table(&freq_table);
 
        if (freq_table) {
                result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
@@ -204,7 +208,10 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy 
*policy)
 
 static int omap_cpu_exit(struct cpufreq_policy *policy)
 {
-       clk_exit_cpufreq_table(&freq_table);
+       if (use_opp)
+               opp_free_cpufreq_table(mpu_dev, &freq_table);
+       else
+               clk_exit_cpufreq_table(&freq_table);
        clk_put(mpu_clk);
        return 0;
 }
@@ -227,12 +234,15 @@ static struct cpufreq_driver omap_driver = {
 
 static int __init omap_cpufreq_init(void)
 {
-       if (cpu_is_omap24xx())
+       use_opp = true;
+       if (cpu_is_omap24xx()) {
                mpu_clk_name = "virt_prcm_set";
-       else if (cpu_is_omap34xx())
+               use_opp = false;
+       } else if (cpu_is_omap34xx()) {
                mpu_clk_name = "dpll1_ck";
-       else if (cpu_is_omap44xx())
+       } else if (cpu_is_omap44xx()) {
                mpu_clk_name = "dpll_mpu_ck";
+       }
 
        if (!mpu_clk_name) {
                pr_err("%s: unsupported Silicon?\n", __func__);
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html