Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e37c10d authored by Paul Walmsley's avatar Paul Walmsley
Browse files

OMAP clock/CPUFreq: add clk_exit_cpufreq_table() 



A subsequent patch adds code on OMAP2xxx to dynamically allocate the
CPUFreq frequency table in clk_init_cpufreq_table(), so for it to
avoid a leak, it will need a corresponding function to free the
memory.  This patch adds clk_exit_cpufreq_table() with generic
code to call a chip-specific variant inside the clockfw_lock spinlock via
struct clk_functions.

Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent ca6eccb3

arch/arm/plat-omap/clock.c

+10 −0
Original line number Diff line number Diff line
@@ -329,6 +329,16 @@ void clk_init_cpufreq_table(struct cpufreq_frequency_table **table) 
		arch_clock->clk_init_cpufreq_table(table);

	spin_unlock_irqrestore(&clockfw_lock, flags);

}



void clk_exit_cpufreq_table(struct cpufreq_frequency_table **table)

{

	unsigned long flags;



	spin_lock_irqsave(&clockfw_lock, flags);

	if (arch_clock->clk_exit_cpufreq_table)

		arch_clock->clk_exit_cpufreq_table(table);

	spin_unlock_irqrestore(&clockfw_lock, flags);

}

#endif



/*-------------------------------------------------------------------------*/

arch/arm/plat-omap/cpu-omap.c

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ static int __init omap_cpu_init(struct cpufreq_policy *policy) 


static int omap_cpu_exit(struct cpufreq_policy *policy)

{

	clk_exit_cpufreq_table(&freq_table);

	clk_put(mpu_clk);

	return 0;

}

arch/arm/plat-omap/include/plat/clock.h

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ struct clk_functions { 
	void		(*clk_disable_unused)(struct clk *clk);

#ifdef CONFIG_CPU_FREQ

	void		(*clk_init_cpufreq_table)(struct cpufreq_frequency_table **);

	void		(*clk_exit_cpufreq_table)(struct cpufreq_frequency_table **);

#endif

};
@@ -135,6 +136,7 @@ extern unsigned long followparent_recalc(struct clk *clk); 
extern void clk_enable_init_clocks(void);

#ifdef CONFIG_CPU_FREQ

extern void clk_init_cpufreq_table(struct cpufreq_frequency_table **table);

extern void clk_exit_cpufreq_table(struct cpufreq_frequency_table **table);

#endif



extern const struct clkops clkops_null;