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. includes fixes from comment: http://marc.info/?l=linux-omap&m=126027057909254&w=2 Cc: Benoit Cousson <b-cousson@xxxxxx> Cc: Eduardo Valentin <eduardo.valentin@xxxxxxxxx> Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> Cc: Madhusudhan Chikkature Rajashekar <madhu.cr@xxxxxx> Cc: Paul Walmsley <paul@xxxxxxxxx> Cc: Romit Dasgupta <romit@xxxxxx> Cc: Sanjeev Premi <premi@xxxxxx> Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx> Cc: Sergio Alberto Aguirre Rodriguez <saaguirre@xxxxxx> Cc: Tero Kristo <Tero.Kristo@xxxxxxxxx> Cc: Thara Gopinath <thara@xxxxxx> Cc: Vishwanath Sripathy <vishwanath.bs@xxxxxx> Signed-off-by: Nishanth Menon <nm@xxxxxx> --- arch/arm/mach-omap2/clock34xx.c | 40 ++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index 5150939..6c4a609 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -1042,30 +1042,44 @@ 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]; + +static struct cpufreq_frequency_table *freq_table; void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table) { - struct omap_opp *prcm; int i = 0; + int opp_num; + struct omap_opp *opp = mpu_opps; + unsigned long freq = ULONG_MAX; - if (!mpu_opps) + if (!mpu_opps) { + pr_warning("%s: failed to initialize frequency" + "table\n", __func__); + return; + } + opp_num = opp_get_opp_count(mpu_opps); + if (opp_num < 0) { + pr_err("%s: no opp table?\n", __func__); return; - - prcm = mpu_opps + MAX_VDD1_OPP; - for (; prcm->rate; prcm--) { - freq_table[i].index = i; - freq_table[i].frequency = prcm->rate / 1000; - i++; } - if (i == 0) { - printk(KERN_WARNING "%s: failed to initialize frequency \ - table\n", - __func__); + freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) * + (opp_num + 1), GFP_ATOMIC); + if (!freq_table) { + pr_warning("%s: failed to allocate frequency" + "table\n", __func__); return; } + while (!IS_ERR(opp = opp_find_freq_approx(opp, &freq, + OPP_SEARCH_LOW))) { + freq_table[i].index = i; + freq_table[i].frequency = freq / 1000; + i++; + /* set the next benchmark to search */ + freq--; + } + freq_table[i].index = i; freq_table[i].frequency = CPUFREQ_TABLE_END; -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
