mirror of
https://github.com/torvalds/linux.git
synced 2024-12-04 18:13:04 +00:00
b4ddad9502
Need use 'clk' instead of 'mclk', which is the original removed local
variable.
The related original commit:
"652ed95 cpufreq: introduce cpufreq_generic_get() routine"
The related error with allmodconfig for unicore32:
CC drivers/cpufreq/unicore2-cpufreq.o
drivers/cpufreq/unicore2-cpufreq.c: In function ‘ucv2_target’:
drivers/cpufreq/unicore2-cpufreq.c:48: error: ‘struct cpufreq_policy’ has no member named ‘mclk’
make[2]: *** [drivers/cpufreq/unicore2-cpufreq.o] Error 1
make[1]: *** [drivers/cpufreq] Error 2
make: *** [drivers] Error 2
Fixes: 652ed95d5f (cpufreq: introduce cpufreq_generic_get() routine)
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: 3.14+ <stable@vger.kernel.org> # 3.14+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
83 lines
1.9 KiB
C
83 lines
1.9 KiB
C
/*
|
|
* clock scaling for the UniCore-II
|
|
*
|
|
* Code specific to PKUnity SoC and UniCore ISA
|
|
*
|
|
* Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
|
|
* Copyright (C) 2001-2010 Guan Xuetao
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/err.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/cpufreq.h>
|
|
|
|
#include <mach/hardware.h>
|
|
|
|
static struct cpufreq_driver ucv2_driver;
|
|
|
|
/* make sure that only the "userspace" governor is run
|
|
* -- anything else wouldn't make sense on this platform, anyway.
|
|
*/
|
|
static int ucv2_verify_speed(struct cpufreq_policy *policy)
|
|
{
|
|
if (policy->cpu)
|
|
return -EINVAL;
|
|
|
|
cpufreq_verify_within_cpu_limits(policy);
|
|
return 0;
|
|
}
|
|
|
|
static int ucv2_target(struct cpufreq_policy *policy,
|
|
unsigned int target_freq,
|
|
unsigned int relation)
|
|
{
|
|
struct cpufreq_freqs freqs;
|
|
int ret;
|
|
|
|
freqs.old = policy->cur;
|
|
freqs.new = target_freq;
|
|
|
|
cpufreq_freq_transition_begin(policy, &freqs);
|
|
ret = clk_set_rate(policy->clk, target_freq * 1000);
|
|
cpufreq_freq_transition_end(policy, &freqs, ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int __init ucv2_cpu_init(struct cpufreq_policy *policy)
|
|
{
|
|
if (policy->cpu != 0)
|
|
return -EINVAL;
|
|
|
|
policy->min = policy->cpuinfo.min_freq = 250000;
|
|
policy->max = policy->cpuinfo.max_freq = 1000000;
|
|
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
|
|
policy->clk = clk_get(NULL, "MAIN_CLK");
|
|
if (IS_ERR(policy->clk))
|
|
return PTR_ERR(policy->clk);
|
|
return 0;
|
|
}
|
|
|
|
static struct cpufreq_driver ucv2_driver = {
|
|
.flags = CPUFREQ_STICKY,
|
|
.verify = ucv2_verify_speed,
|
|
.target = ucv2_target,
|
|
.get = cpufreq_generic_get,
|
|
.init = ucv2_cpu_init,
|
|
.name = "UniCore-II",
|
|
};
|
|
|
|
static int __init ucv2_cpufreq_init(void)
|
|
{
|
|
return cpufreq_register_driver(&ucv2_driver);
|
|
}
|
|
|
|
arch_initcall(ucv2_cpufreq_init);
|