omap2_clk_init_cpufreq_table currently directly accesses the opp table, making it unscalable to various OMAPs. Instead use the accessor functions to populate the cpufreq table
Tested on: SDP3430, SDP3630 Cc: Benoit Cousson <[email protected]> Cc: Jon Hunter <[email protected]> Cc: Kevin Hilman <[email protected]> Cc: Madhusudhan Chikkature Rajashekar <[email protected]> Cc: Paul Walmsley <[email protected]> Cc: Romit Dasgupta <[email protected]> Cc: Sanjeev Premi <[email protected]> Cc: Santosh Shilimkar <[email protected]> Cc: Sergio Alberto Aguirre Rodriguez <[email protected]> Cc: SuiLun Lam <[email protected]> Cc: Thara Gopinath <[email protected]> Cc: Vishwanath Sripathy <[email protected]> Signed-off-by: Nishanth Menon <[email protected]> --- arch/arm/mach-omap2/clock34xx.c | 46 +++++++++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index da5bc1f..daec6ea 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -1042,28 +1042,46 @@ static unsigned long omap3_clkoutx2_recalc(struct clk *clk) #if defined(CONFIG_ARCH_OMAP3) #ifdef CONFIG_CPU_FREQ -static struct cpufreq_frequency_table freq_table[MAX_VDD1_OPP+1]; + +/* Use a dummy table with no entries to start with */ +static struct cpufreq_frequency_table dummy_freq_table = { + .frequency = CPUFREQ_TABLE_END, +}; +static struct cpufreq_frequency_table *freq_table = &dummy_freq_table; void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table) { - struct omap_opp *prcm; - int i = 0; + int i; + int ret; + u8 opp_id; + unsigned long freq; if (!mpu_opps) return; - - prcm = mpu_opps + MAX_VDD1_OPP; - for (; prcm->rate; prcm--) { - freq_table[i].index = i; - freq_table[i].frequency = prcm->rate / 1000; - i++; + ret = get_limit_freq(&freq, mpu_opps, true, true); + if (ret) { + pr_warning("%s: failed to initialize frequency" + "table\n", __func__); + return; } + /* The following should'nt fail */ + BUG_ON(freq_to_opp(&opp_id, mpu_opps, freq)); - if (i == 0) { - printk(KERN_WARNING "%s: failed to initialize frequency \ - table\n", - __func__); - return; + /* There is a risk of overallocating if the lower/intermediate + * OPPs are disabled, but the amount is not expected to be high + * in comparison to reallocating to exactly available opps + */ + freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) * + (opp_id + 1), GFP_KERNEL); + + /* Populate the first index.. we already found the freq */ + freq_table[0].index = 0; + freq_table[0].frequency = freq / 1000; + + /* Populate the table highest to lowest */ + for (i = 1; !get_next_freq(&freq, mpu_opps, false, true, true); i++) { + freq_table[i].index = i; + freq_table[i].frequency = freq / 1000; } freq_table[i].index = i; -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
