summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHolger Schurig <h.schurig@mn-solutions.de>2008-02-11 16:53:15 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-02-17 10:42:10 +0000
commitea833f0b5a8afcc698c5ccb06237902c0e21e032 (patch)
treec614c6a58f30f4c3b38ee43f527251a113681edd /arch
parentac2bf5bdc6ab9d820152623122973ccb1c166031 (diff)
downloadlinux-ea833f0b5a8afcc698c5ccb06237902c0e21e032.tar.gz
linux-ea833f0b5a8afcc698c5ccb06237902c0e21e032.tar.bz2
linux-ea833f0b5a8afcc698c5ccb06237902c0e21e032.zip
[ARM] 4829/1: add .get method to pxa-cpufreq to silence a warning
The .get method is needed for suspend/resume. Otherwise you get this in dmesg: cpufreq: suspend failed to assert current frequency is what timing core thinks it is. cpufreq: resume failed to assert current frequency is what timing core thinks it is. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/cpu-pxa.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cpu-pxa.c b/arch/arm/mach-pxa/cpu-pxa.c
index cbc583beedc8..939a3867f77c 100644
--- a/arch/arm/mach-pxa/cpu-pxa.c
+++ b/arch/arm/mach-pxa/cpu-pxa.c
@@ -134,7 +134,7 @@ static int pxa_set_target(struct cpufreq_policy *policy,
struct cpufreq_frequency_table *pxa_freqs_table;
pxa_freqs_t *pxa_freq_settings;
struct cpufreq_freqs freqs;
- int idx;
+ unsigned int idx;
unsigned long flags;
unsigned int unused, preset_mdrefr, postset_mdrefr;
void *ramstart = phys_to_virt(0xa0000000);
@@ -233,6 +233,11 @@ static int pxa_set_target(struct cpufreq_policy *policy,
return 0;
}
+static unsigned int pxa_cpufreq_get(unsigned int cpu)
+{
+ return get_clk_frequency_khz(0);
+}
+
static int pxa_cpufreq_init(struct cpufreq_policy *policy)
{
int i;
@@ -269,6 +274,7 @@ static struct cpufreq_driver pxa_cpufreq_driver = {
.verify = pxa_verify_policy,
.target = pxa_set_target,
.init = pxa_cpufreq_init,
+ .get = pxa_cpufreq_get,
.name = "PXA25x",
};