diff options
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 6dfcca72e90f..bcf3f0a78463 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -53,7 +53,7 @@ static unsigned char N2_clk_mult[8] = { 0, 0, 2, 3, 4, 0, 6, 0 }; | |||
53 | * We assume these values have been applied via a fcs. | 53 | * We assume these values have been applied via a fcs. |
54 | * If info is not 0 we also display the current settings. | 54 | * If info is not 0 we also display the current settings. |
55 | */ | 55 | */ |
56 | unsigned int get_clk_frequency_khz(int info) | 56 | unsigned int pxa25x_get_clk_frequency_khz(int info) |
57 | { | 57 | { |
58 | unsigned long cccr, turbo; | 58 | unsigned long cccr, turbo; |
59 | unsigned int l, L, m, M, n2, N; | 59 | unsigned int l, L, m, M, n2, N; |
@@ -86,28 +86,14 @@ unsigned int get_clk_frequency_khz(int info) | |||
86 | return (turbo & 1) ? (N/1000) : (M/1000); | 86 | return (turbo & 1) ? (N/1000) : (M/1000); |
87 | } | 87 | } |
88 | 88 | ||
89 | EXPORT_SYMBOL(get_clk_frequency_khz); | ||
90 | |||
91 | /* | 89 | /* |
92 | * Return the current memory clock frequency in units of 10kHz | 90 | * Return the current memory clock frequency in units of 10kHz |
93 | */ | 91 | */ |
94 | unsigned int get_memclk_frequency_10khz(void) | 92 | unsigned int pxa25x_get_memclk_frequency_10khz(void) |
95 | { | 93 | { |
96 | return L_clk_mult[(CCCR >> 0) & 0x1f] * BASE_CLK / 10000; | 94 | return L_clk_mult[(CCCR >> 0) & 0x1f] * BASE_CLK / 10000; |
97 | } | 95 | } |
98 | 96 | ||
99 | EXPORT_SYMBOL(get_memclk_frequency_10khz); | ||
100 | |||
101 | /* | ||
102 | * Return the current LCD clock frequency in units of 10kHz | ||
103 | */ | ||
104 | unsigned int get_lcdclk_frequency_10khz(void) | ||
105 | { | ||
106 | return get_memclk_frequency_10khz(); | ||
107 | } | ||
108 | |||
109 | EXPORT_SYMBOL(get_lcdclk_frequency_10khz); | ||
110 | |||
111 | #ifdef CONFIG_PM | 97 | #ifdef CONFIG_PM |
112 | 98 | ||
113 | #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x | 99 | #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x |