[ARM] pxa: fix naming of memory/lcd/core clock functions

Rename pxa25x and pxa27x memory/lcd/core clock functions, and
select the correct version at run time.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 38 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 98df63898d1d..ac2b1fc5bda9 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -43,6 +43,44 @@
 #include "generic.h"
 
 /*
+ * 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_pxa21x() || cpu_is_pxa25x())
+                return pxa25x_get_clk_frequency_khz(info);
+        else
+                return pxa27x_get_clk_frequency_khz(info);
+}
+EXPORT_SYMBOL(get_clk_frequency_khz);
+
+/*
+ * Return the current memory clock frequency in units of 10kHz
+ */
+unsigned int get_memclk_frequency_10khz(void)
+{
+        if (cpu_is_pxa21x() || cpu_is_pxa25x())
+                return pxa25x_get_memclk_frequency_10khz();
+        else
+                return pxa27x_get_memclk_frequency_10khz();
+}
+EXPORT_SYMBOL(get_memclk_frequency_10khz);
+
+/*
+ * Return the current LCD clock frequency in units of 10kHz
+ */
+unsigned int get_lcdclk_frequency_10khz(void)
+{
+        if (cpu_is_pxa21x() || cpu_is_pxa25x())
+                return pxa25x_get_memclk_frequency_10khz();
+        else
+                return pxa27x_get_lcdclk_frequency_10khz();
+}
+EXPORT_SYMBOL(get_lcdclk_frequency_10khz);
+
+/*
  * Handy function to set GPIO alternate functions
  */