Skip to content

Commit

Permalink
cpufreq: Give driver used for dbx500 family a more generic name
Browse files Browse the repository at this point in the history 
This driver doesn't only handle cpufreq functionality for the
db8500 anymore. There are new variants which rely on it too.
Let's make the name a bit more generic.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Lee Jones authored and Linus Walleij committed Jan 7, 2013
1 parent d1c3ed6 commit edb10c1
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion drivers/cpufreq/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o

##################################################################################
# ARM SoC drivers
obj-$(CONFIG_UX500_SOC_DB8500) += db8500-cpufreq.o
obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o
obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o
obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o
obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o
Expand Down
58 changes: 29 additions & 29 deletions drivers/cpufreq/db8500-cpufreq.c → drivers/cpufreq/dbx500-cpufreq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
static struct cpufreq_frequency_table *freq_table;
static struct clk *armss_clk;

static struct freq_attr *db8500_cpufreq_attr[] = {
static struct freq_attr *dbx500_cpufreq_attr[] = {
&cpufreq_freq_attr_scaling_available_freqs,
NULL,
};

static int db8500_cpufreq_verify_speed(struct cpufreq_policy *policy)
static int dbx500_cpufreq_verify_speed(struct cpufreq_policy *policy)
{
return cpufreq_frequency_table_verify(policy, freq_table);
}

static int db8500_cpufreq_target(struct cpufreq_policy *policy,
static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
unsigned int target_freq,
unsigned int relation)
{
Expand Down Expand Up @@ -61,7 +61,7 @@ static int db8500_cpufreq_target(struct cpufreq_policy *policy,

/* update armss clk frequency */
if (clk_set_rate(armss_clk, freq_table[idx].frequency * 1000)) {
pr_err("db8500-cpufreq: Failed to update armss clk\n");
pr_err("dbx500-cpufreq: Failed to update armss clk\n");
return -EINVAL;
}

Expand All @@ -72,7 +72,7 @@ static int db8500_cpufreq_target(struct cpufreq_policy *policy,
return 0;
}

static unsigned int db8500_cpufreq_getspeed(unsigned int cpu)
static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
{
int i = 0;
unsigned long freq = clk_get_rate(armss_clk) / 1000;
Expand All @@ -84,22 +84,22 @@ static unsigned int db8500_cpufreq_getspeed(unsigned int cpu)
}

/* We could not find a corresponding frequency. */
pr_err("db8500-cpufreq: Failed to find cpufreq speed\n");
pr_err("dbx500-cpufreq: Failed to find cpufreq speed\n");
return 0;
}

static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy)
static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)
{
int i = 0;
int res;

armss_clk = clk_get(NULL, "armss");
if (IS_ERR(armss_clk)) {
pr_err("db8500-cpufreq : Failed to get armss clk\n");
pr_err("dbx500-cpufreq : Failed to get armss clk\n");
return PTR_ERR(armss_clk);
}

pr_info("db8500-cpufreq : Available frequencies:\n");
pr_info("dbx500-cpufreq : Available frequencies:\n");
while (freq_table[i].frequency != CPUFREQ_TABLE_END) {
pr_info(" %d Mhz\n", freq_table[i].frequency/1000);
i++;
Expand All @@ -110,14 +110,14 @@ static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy)
if (!res)
cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
else {
pr_err("db8500-cpufreq : Failed to read policy table\n");
pr_err("dbx500-cpufreq : Failed to read policy table\n");
clk_put(armss_clk);
return res;
}

policy->min = policy->cpuinfo.min_freq;
policy->max = policy->cpuinfo.max_freq;
policy->cur = db8500_cpufreq_getspeed(policy->cpu);
policy->cur = dbx500_cpufreq_getspeed(policy->cpu);
policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

/*
Expand All @@ -135,45 +135,45 @@ static int __cpuinit db8500_cpufreq_init(struct cpufreq_policy *policy)
return 0;
}

static struct cpufreq_driver db8500_cpufreq_driver = {
static struct cpufreq_driver dbx500_cpufreq_driver = {
.flags = CPUFREQ_STICKY,
.verify = db8500_cpufreq_verify_speed,
.target = db8500_cpufreq_target,
.get = db8500_cpufreq_getspeed,
.init = db8500_cpufreq_init,
.name = "DB8500",
.attr = db8500_cpufreq_attr,
.verify = dbx500_cpufreq_verify_speed,
.target = dbx500_cpufreq_target,
.get = dbx500_cpufreq_getspeed,
.init = dbx500_cpufreq_init,
.name = "DBX500",
.attr = dbx500_cpufreq_attr,
};

static int db8500_cpufreq_probe(struct platform_device *pdev)
static int dbx500_cpufreq_probe(struct platform_device *pdev)
{
freq_table = dev_get_platdata(&pdev->dev);

if (!freq_table) {
pr_err("db8500-cpufreq: Failed to fetch cpufreq table\n");
pr_err("dbx500-cpufreq: Failed to fetch cpufreq table\n");
return -ENODEV;
}

return cpufreq_register_driver(&db8500_cpufreq_driver);
return cpufreq_register_driver(&dbx500_cpufreq_driver);
}

static struct platform_driver db8500_cpufreq_plat_driver = {
static struct platform_driver dbx500_cpufreq_plat_driver = {
.driver = {
.name = "cpufreq-u8500",
.name = "cpufreq-ux500",
.owner = THIS_MODULE,
},
.probe = db8500_cpufreq_probe,
.probe = dbx500_cpufreq_probe,
};

static int __init db8500_cpufreq_register(void)
static int __init dbx500_cpufreq_register(void)
{
if (!cpu_is_u8500_family())
return -ENODEV;

pr_info("cpufreq for DB8500 started\n");
return platform_driver_register(&db8500_cpufreq_plat_driver);
pr_info("cpufreq for DBX500 started\n");
return platform_driver_register(&dbx500_cpufreq_plat_driver);
}
device_initcall(db8500_cpufreq_register);
device_initcall(dbx500_cpufreq_register);

MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("cpufreq driver for DB8500");
MODULE_DESCRIPTION("cpufreq driver for DBX500");

0 comments on commit edb10c1

Please sign in to comment.