Commit 799929d7 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Eric Miao

ARM: pxa: reduce the scope of get_memclk_frequency_10khz()

Up to now, only pxa2xx pcmcia driver is using the API. No other device driver
is using this API in PXA3xx or any other PXA silicons.

Restrict the scope only on pxa2xx and remove the implementation of pxa3xx. So
we can avoid oo much checking on cpuid after more pxa chips supported.
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent ecf89b8a
...@@ -79,8 +79,7 @@ unsigned int get_memclk_frequency_10khz(void) ...@@ -79,8 +79,7 @@ unsigned int get_memclk_frequency_10khz(void)
return pxa25x_get_memclk_frequency_10khz(); return pxa25x_get_memclk_frequency_10khz();
else if (cpu_is_pxa27x()) else if (cpu_is_pxa27x())
return pxa27x_get_memclk_frequency_10khz(); return pxa27x_get_memclk_frequency_10khz();
else return 0;
return pxa3xx_get_memclk_frequency_10khz();
} }
EXPORT_SYMBOL(get_memclk_frequency_10khz); EXPORT_SYMBOL(get_memclk_frequency_10khz);
......
...@@ -54,11 +54,9 @@ static inline void pxa2xx_clear_reset_status(unsigned int mask) {} ...@@ -54,11 +54,9 @@ static inline void pxa2xx_clear_reset_status(unsigned int mask) {}
#ifdef CONFIG_PXA3xx #ifdef CONFIG_PXA3xx
extern unsigned pxa3xx_get_clk_frequency_khz(int); extern unsigned pxa3xx_get_clk_frequency_khz(int);
extern unsigned pxa3xx_get_memclk_frequency_10khz(void);
extern void pxa3xx_clear_reset_status(unsigned int); extern void pxa3xx_clear_reset_status(unsigned int);
#else #else
#define pxa3xx_get_clk_frequency_khz(x) (0) #define pxa3xx_get_clk_frequency_khz(x) (0)
#define pxa3xx_get_memclk_frequency_10khz() (0)
static inline void pxa3xx_clear_reset_status(unsigned int mask) {} static inline void pxa3xx_clear_reset_status(unsigned int mask) {}
#endif #endif
......
...@@ -98,23 +98,6 @@ unsigned int pxa3xx_get_clk_frequency_khz(int info) ...@@ -98,23 +98,6 @@ unsigned int pxa3xx_get_clk_frequency_khz(int info)
return CLK / 1000; return CLK / 1000;
} }
/*
* Return the current static memory controller clock frequency
* in units of 10kHz
*/
unsigned int pxa3xx_get_memclk_frequency_10khz(void)
{
unsigned long acsr;
unsigned int smcfs, clk = 0;
acsr = ACSR;
smcfs = (acsr >> 23) & 0x7;
clk = (acsr & ACCR_D0CS) ? RO_CLK : smcfs_mult[smcfs] * BASE_CLK;
return (clk / 10000);
}
void pxa3xx_clear_reset_status(unsigned int mask) void pxa3xx_clear_reset_status(unsigned int mask)
{ {
/* RESET_STATUS_* has a 1:1 mapping with ARSR */ /* RESET_STATUS_* has a 1:1 mapping with ARSR */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment