[PATCH] OMAP2+: clock: cleanup CPUfreq leftovers

[PATCH] OMAP2+: clock: cleanup CPUfreq leftovers

[Kevin Hilman]

Now that we have OPP layer, and OMAP CPUfreq driver is using it, we no
longer need/use the clock framework code for filling up CPUfreq
tables.  Remove it.

Signed-off-by: Kevin Hilman <khilman@ti.com>
---
Paul, this patch has a dependency on the OMAP CPUFreq driver
move/cleanup series just posted.  Assuming that is merged for v3.2,
this can go also.

 arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c |   80 --------------------------
 arch/arm/mach-omap2/clock.c                  |    5 --
 arch/arm/mach-omap2/clock.h                  |    8 ---
 3 files changed, 0 insertions(+), 93 deletions(-)

diff --git a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
index 39f9d5a..9a13e07 100644
--- a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
+++ b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
@@ -164,83 +164,3 @@ int omap2_select_table_rate(struct clk *clk, unsigned long rate)
 
 	return 0;
 }
-
-#ifdef CONFIG_CPU_FREQ
-/*
- * Walk PRCM rate table and fillout cpufreq freq_table
- * XXX This should be replaced by an OPP layer in the near future
- */
-static struct cpufreq_frequency_table *freq_table;
-
-void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
-{
-	const struct prcm_config *prcm;
-	int i = 0;
-	int tbl_sz = 0;
-
-	if (!cpu_is_omap24xx())
-		return;
-
-	for (prcm = rate_table; prcm->mpu_speed; prcm++) {
-		if (!(prcm->flags & cpu_mask))
-			continue;
-		if (prcm->xtal_speed != sclk->rate)
-			continue;
-
-		/* don't put bypass rates in table */
-		if (prcm->dpll_speed == prcm->xtal_speed)
-			continue;
-
-		tbl_sz++;
-	}
-
-	/*
-	 * XXX Ensure that we're doing what CPUFreq expects for this error
-	 * case and the following one
-	 */
-	if (tbl_sz == 0) {
-		pr_warning("%s: no matching entries in rate_table\n",
-			   __func__);
-		return;
-	}
-
-	/* Include the CPUFREQ_TABLE_END terminator entry */
-	tbl_sz++;
-
-	freq_table = kzalloc(sizeof(struct cpufreq_frequency_table) * tbl_sz,
-			     GFP_ATOMIC);
-	if (!freq_table) {
-		pr_err("%s: could not kzalloc frequency table\n", __func__);
-		return;
-	}
-
-	for (prcm = rate_table; prcm->mpu_speed; prcm++) {
-		if (!(prcm->flags & cpu_mask))
-			continue;
-		if (prcm->xtal_speed != sclk->rate)
-			continue;
-
-		/* don't put bypass rates in table */
-		if (prcm->dpll_speed == prcm->xtal_speed)
-			continue;
-
-		freq_table[i].index = i;
-		freq_table[i].frequency = prcm->mpu_speed / 1000;
-		i++;
-	}
-
-	freq_table[i].index = i;
-	freq_table[i].frequency = CPUFREQ_TABLE_END;
-
-	*table = &freq_table[0];
-}
-
-void omap2_clk_exit_cpufreq_table(struct cpufreq_frequency_table **table)
-{
-	if (!cpu_is_omap24xx())
-		return;
-
-	kfree(freq_table);
-}
-
-#endif
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 1f3481f..160e61c 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -536,10 +536,5 @@ struct clk_functions omap2_clk_functions = {
 	.clk_set_rate		= omap2_clk_set_rate,
 	.clk_set_parent		= omap2_clk_set_parent,
 	.clk_disable_unused	= omap2_clk_disable_unused,
-#ifdef CONFIG_CPU_FREQ
-	/* These will be removed when the OPP code is integrated */
-	.clk_init_cpufreq_table	= omap2_clk_init_cpufreq_table,
-	.clk_exit_cpufreq_table	= omap2_clk_exit_cpufreq_table,
-#endif
 };
 
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index 48ac568..7fa20b3 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -144,14 +144,6 @@ extern const struct clksel_rate gpt_sys_rates[];
 extern const struct clksel_rate gfx_l3_rates[];
 extern const struct clksel_rate dsp_ick_rates[];
 
-#if defined(CONFIG_ARCH_OMAP2) && defined(CONFIG_CPU_FREQ)
-extern void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table);
-extern void omap2_clk_exit_cpufreq_table(struct cpufreq_frequency_table **table);
-#else
-#define omap2_clk_init_cpufreq_table	0
-#define omap2_clk_exit_cpufreq_table	0
-#endif
-
 extern const struct clkops clkops_omap2_iclk_dflt_wait;
 extern const struct clkops clkops_omap2_iclk_dflt;
 extern const struct clkops clkops_omap2_iclk_idle_only;
-- 
1.7.6

Re: [PATCH] OMAP2+: clock: cleanup CPUfreq leftovers

[Paul Walmsley]

Hi Kevin

On Thu, 22 Sep 2011, Kevin Hilman wrote:

> Now that we have OPP layer, and OMAP CPUfreq driver is using it, we no
> longer need/use the clock framework code for filling up CPUfreq
> tables.  Remove it.
> 
> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
> Paul, this patch has a dependency on the OMAP CPUFreq driver
> move/cleanup series just posted.  Assuming that is merged for v3.2,
> this can go also.

Great, could you cc lakml also ?

thanks,


- Paul

Re: [PATCH] OMAP2+: clock: cleanup CPUfreq leftovers

[Paul Walmsley]

On Thu, 22 Sep 2011, Paul Walmsley wrote:

> On Thu, 22 Sep 2011, Kevin Hilman wrote:
> 
> > Now that we have OPP layer, and OMAP CPUfreq driver is using it, we no
> > longer need/use the clock framework code for filling up CPUfreq
> > tables.  Remove it.
> > 
> > Signed-off-by: Kevin Hilman <khilman@ti.com>
> > ---
> > Paul, this patch has a dependency on the OMAP CPUFreq driver
> > move/cleanup series just posted.  Assuming that is merged for v3.2,
> > this can go also.
> 
> Great, could you cc lakml also ?

By the way, I guess the subject line should start with "ARM: OMAP2+: 
clock: " .. etc., per Arnd's recent request.


- Paul

Re: [PATCH] OMAP2+: clock: cleanup CPUfreq leftovers

[Kevin Hilman]

Paul Walmsley <paul@pwsan.com> writes:

> On Thu, 22 Sep 2011, Paul Walmsley wrote:
>
>> On Thu, 22 Sep 2011, Kevin Hilman wrote:
>> 
>> > Now that we have OPP layer, and OMAP CPUfreq driver is using it, we no
>> > longer need/use the clock framework code for filling up CPUfreq
>> > tables.  Remove it.
>> > 
>> > Signed-off-by: Kevin Hilman <khilman@ti.com>
>> > ---
>> > Paul, this patch has a dependency on the OMAP CPUFreq driver
>> > move/cleanup series just posted.  Assuming that is merged for v3.2,
>> > this can go also.
>> 
>> Great, could you cc lakml also ?

doh.

> By the way, I guess the subject line should start with "ARM: OMAP2+: 
> clock: " .. etc., per Arnd's recent request.

yeah, will refresh.

Kevin