ARM: pxa: remove get_clk_frequency_khz()
get_clk_frequency_khz() is not a proper name for a global function, and there is only one caller. Convert viper to use the properly namespaced pxa25x_get_clk_frequency_khz() and remove the other references. Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Cc: linux-pm@vger.kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
6a946f1bd5
commit
e0a3596eb8
@ -55,21 +55,6 @@ void __init pxa_timer_init(void)
|
|||||||
pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x40a00000));
|
pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x40a00000));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Get the clock frequency as reflected by CCCR and the turbo flag.
|
|
||||||
* We assume these values have been applied via a fcs.
|
|
||||||
* If info is not 0 we also display the current settings.
|
|
||||||
*/
|
|
||||||
unsigned int get_clk_frequency_khz(int info)
|
|
||||||
{
|
|
||||||
if (cpu_is_pxa25x())
|
|
||||||
return pxa25x_get_clk_frequency_khz(info);
|
|
||||||
else if (cpu_is_pxa27x())
|
|
||||||
return pxa27x_get_clk_frequency_khz(info);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(get_clk_frequency_khz);
|
|
||||||
|
|
||||||
void pxa_smemc_set_pcmcia_timing(int sock, u32 mcmem, u32 mcatt, u32 mcio)
|
void pxa_smemc_set_pcmcia_timing(int sock, u32 mcmem, u32 mcatt, u32 mcio)
|
||||||
{
|
{
|
||||||
__raw_writel(mcmem, MCMEM(sock));
|
__raw_writel(mcmem, MCMEM(sock));
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
struct irq_data;
|
struct irq_data;
|
||||||
|
|
||||||
extern unsigned int get_clk_frequency_khz(int info);
|
|
||||||
extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *,
|
extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *,
|
||||||
unsigned int));
|
unsigned int));
|
||||||
extern void __init pxa_map_io(void);
|
extern void __init pxa_map_io(void);
|
||||||
|
@ -851,7 +851,7 @@ static void __init viper_init_vcore_gpios(void)
|
|||||||
goto err_dir;
|
goto err_dir;
|
||||||
|
|
||||||
/* c/should assume redboot set the correct level ??? */
|
/* c/should assume redboot set the correct level ??? */
|
||||||
viper_set_core_cpu_voltage(get_clk_frequency_khz(0), 1);
|
viper_set_core_cpu_voltage(pxa25x_get_clk_frequency_khz(0), 1);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -107,8 +107,6 @@ static struct pxa_freqs pxa27x_freqs[] = {
|
|||||||
static struct cpufreq_frequency_table
|
static struct cpufreq_frequency_table
|
||||||
pxa27x_freq_table[NUM_PXA27x_FREQS+1];
|
pxa27x_freq_table[NUM_PXA27x_FREQS+1];
|
||||||
|
|
||||||
extern unsigned get_clk_frequency_khz(int info);
|
|
||||||
|
|
||||||
#ifdef CONFIG_REGULATOR
|
#ifdef CONFIG_REGULATOR
|
||||||
|
|
||||||
static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq)
|
static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user