* [RESEND PATCH 1/5] cpufreq: Give driver used for dbx500 family a more generic name
2012-12-10 15:25 [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts Ulf Hansson
@ 2012-12-10 15:25 ` Ulf Hansson
2012-12-10 15:25 ` [RESEND PATCH 2/5] mfd: db8500: Update cpufreq device name Ulf Hansson
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Ulf Hansson @ 2012-12-10 15:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Lee Jones <lee.jones@linaro.org>
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>
---
drivers/cpufreq/Makefile | 2 +-
drivers/cpufreq/db8500-cpufreq.c | 179 --------------------------------------
drivers/cpufreq/dbx500-cpufreq.c | 179 ++++++++++++++++++++++++++++++++++++++
3 files changed, 180 insertions(+), 180 deletions(-)
delete mode 100644 drivers/cpufreq/db8500-cpufreq.c
create mode 100644 drivers/cpufreq/dbx500-cpufreq.c
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 1bc90e1..675559f 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -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
diff --git a/drivers/cpufreq/db8500-cpufreq.c b/drivers/cpufreq/db8500-cpufreq.c
deleted file mode 100644
index 4f154bc..0000000
--- a/drivers/cpufreq/db8500-cpufreq.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) STMicroelectronics 2009
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License v2
- * Author: Sundar Iyer <sundar.iyer@stericsson.com>
- * Author: Martin Persson <martin.persson@stericsson.com>
- * Author: Jonas Aaberg <jonas.aberg@stericsson.com>
- *
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/cpufreq.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <mach/id.h>
-
-static struct cpufreq_frequency_table *freq_table;
-static struct clk *armss_clk;
-
-static struct freq_attr *db8500_cpufreq_attr[] = {
- &cpufreq_freq_attr_scaling_available_freqs,
- NULL,
-};
-
-static int db8500_cpufreq_verify_speed(struct cpufreq_policy *policy)
-{
- return cpufreq_frequency_table_verify(policy, freq_table);
-}
-
-static int db8500_cpufreq_target(struct cpufreq_policy *policy,
- unsigned int target_freq,
- unsigned int relation)
-{
- struct cpufreq_freqs freqs;
- unsigned int idx;
-
- /* scale the target frequency to one of the extremes supported */
- if (target_freq < policy->cpuinfo.min_freq)
- target_freq = policy->cpuinfo.min_freq;
- if (target_freq > policy->cpuinfo.max_freq)
- target_freq = policy->cpuinfo.max_freq;
-
- /* Lookup the next frequency */
- if (cpufreq_frequency_table_target
- (policy, freq_table, target_freq, relation, &idx)) {
- return -EINVAL;
- }
-
- freqs.old = policy->cur;
- freqs.new = freq_table[idx].frequency;
-
- if (freqs.old == freqs.new)
- return 0;
-
- /* pre-change notification */
- for_each_cpu(freqs.cpu, policy->cpus)
- cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
- /* 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");
- return -EINVAL;
- }
-
- /* post change notification */
- for_each_cpu(freqs.cpu, policy->cpus)
- cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
- return 0;
-}
-
-static unsigned int db8500_cpufreq_getspeed(unsigned int cpu)
-{
- int i = 0;
- unsigned long freq = clk_get_rate(armss_clk) / 1000;
-
- while (freq_table[i].frequency != CPUFREQ_TABLE_END) {
- if (freq <= freq_table[i].frequency)
- return freq_table[i].frequency;
- i++;
- }
-
- /* We could not find a corresponding frequency. */
- pr_err("db8500-cpufreq: Failed to find cpufreq speed\n");
- return 0;
-}
-
-static int __cpuinit db8500_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");
- return PTR_ERR(armss_clk);
- }
-
- pr_info("db8500-cpufreq : Available frequencies:\n");
- while (freq_table[i].frequency != CPUFREQ_TABLE_END) {
- pr_info(" %d Mhz\n", freq_table[i].frequency/1000);
- i++;
- }
-
- /* get policy fields based on the table */
- res = cpufreq_frequency_table_cpuinfo(policy, freq_table);
- if (!res)
- cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
- else {
- pr_err("db8500-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->governor = CPUFREQ_DEFAULT_GOVERNOR;
-
- /*
- * FIXME : Need to take time measurement across the target()
- * function with no/some/all drivers in the notification
- * list.
- */
- policy->cpuinfo.transition_latency = 20 * 1000; /* in ns */
-
- /* policy sharing between dual CPUs */
- cpumask_copy(policy->cpus, cpu_present_mask);
-
- policy->shared_type = CPUFREQ_SHARED_TYPE_ALL;
-
- return 0;
-}
-
-static struct cpufreq_driver db8500_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,
-};
-
-static int db8500_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");
- return -ENODEV;
- }
-
- return cpufreq_register_driver(&db8500_cpufreq_driver);
-}
-
-static struct platform_driver db8500_cpufreq_plat_driver = {
- .driver = {
- .name = "cpufreq-u8500",
- .owner = THIS_MODULE,
- },
- .probe = db8500_cpufreq_probe,
-};
-
-static int __init db8500_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);
-}
-device_initcall(db8500_cpufreq_register);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("cpufreq driver for DB8500");
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
new file mode 100644
index 0000000..0a411b5
--- /dev/null
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License Terms: GNU General Public License v2
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
+ * Author: Martin Persson <martin.persson@stericsson.com>
+ * Author: Jonas Aaberg <jonas.aberg@stericsson.com>
+ *
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/cpufreq.h>
+#include <linux/delay.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <mach/id.h>
+
+static struct cpufreq_frequency_table *freq_table;
+static struct clk *armss_clk;
+
+static struct freq_attr *dbx500_cpufreq_attr[] = {
+ &cpufreq_freq_attr_scaling_available_freqs,
+ NULL,
+};
+
+static int dbx500_cpufreq_verify_speed(struct cpufreq_policy *policy)
+{
+ return cpufreq_frequency_table_verify(policy, freq_table);
+}
+
+static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
+ unsigned int target_freq,
+ unsigned int relation)
+{
+ struct cpufreq_freqs freqs;
+ unsigned int idx;
+
+ /* scale the target frequency to one of the extremes supported */
+ if (target_freq < policy->cpuinfo.min_freq)
+ target_freq = policy->cpuinfo.min_freq;
+ if (target_freq > policy->cpuinfo.max_freq)
+ target_freq = policy->cpuinfo.max_freq;
+
+ /* Lookup the next frequency */
+ if (cpufreq_frequency_table_target
+ (policy, freq_table, target_freq, relation, &idx)) {
+ return -EINVAL;
+ }
+
+ freqs.old = policy->cur;
+ freqs.new = freq_table[idx].frequency;
+
+ if (freqs.old == freqs.new)
+ return 0;
+
+ /* pre-change notification */
+ for_each_cpu(freqs.cpu, policy->cpus)
+ cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+
+ /* update armss clk frequency */
+ if (clk_set_rate(armss_clk, freq_table[idx].frequency * 1000)) {
+ pr_err("dbx500-cpufreq: Failed to update armss clk\n");
+ return -EINVAL;
+ }
+
+ /* post change notification */
+ for_each_cpu(freqs.cpu, policy->cpus)
+ cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+
+ return 0;
+}
+
+static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
+{
+ int i = 0;
+ unsigned long freq = clk_get_rate(armss_clk) / 1000;
+
+ while (freq_table[i].frequency != CPUFREQ_TABLE_END) {
+ if (freq <= freq_table[i].frequency)
+ return freq_table[i].frequency;
+ i++;
+ }
+
+ /* We could not find a corresponding frequency. */
+ pr_err("dbx500-cpufreq: Failed to find cpufreq speed\n");
+ return 0;
+}
+
+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("dbx500-cpufreq : Failed to get armss clk\n");
+ return PTR_ERR(armss_clk);
+ }
+
+ 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++;
+ }
+
+ /* get policy fields based on the table */
+ res = cpufreq_frequency_table_cpuinfo(policy, freq_table);
+ if (!res)
+ cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
+ else {
+ 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 = dbx500_cpufreq_getspeed(policy->cpu);
+ policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
+
+ /*
+ * FIXME : Need to take time measurement across the target()
+ * function with no/some/all drivers in the notification
+ * list.
+ */
+ policy->cpuinfo.transition_latency = 20 * 1000; /* in ns */
+
+ /* policy sharing between dual CPUs */
+ cpumask_copy(policy->cpus, cpu_present_mask);
+
+ policy->shared_type = CPUFREQ_SHARED_TYPE_ALL;
+
+ return 0;
+}
+
+static struct cpufreq_driver dbx500_cpufreq_driver = {
+ .flags = CPUFREQ_STICKY,
+ .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 dbx500_cpufreq_probe(struct platform_device *pdev)
+{
+ freq_table = dev_get_platdata(&pdev->dev);
+
+ if (!freq_table) {
+ pr_err("dbx500-cpufreq: Failed to fetch cpufreq table\n");
+ return -ENODEV;
+ }
+
+ return cpufreq_register_driver(&dbx500_cpufreq_driver);
+}
+
+static struct platform_driver dbx500_cpufreq_plat_driver = {
+ .driver = {
+ .name = "cpufreq-ux500",
+ .owner = THIS_MODULE,
+ },
+ .probe = dbx500_cpufreq_probe,
+};
+
+static int __init dbx500_cpufreq_register(void)
+{
+ if (!cpu_is_u8500_family())
+ return -ENODEV;
+
+ pr_info("cpufreq for DBX500 started\n");
+ return platform_driver_register(&dbx500_cpufreq_plat_driver);
+}
+device_initcall(dbx500_cpufreq_register);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("cpufreq driver for DBX500");
--
1.7.10
^ permalink raw reply related [flat|nested] 11+ messages in thread* [RESEND PATCH 2/5] mfd: db8500: Update cpufreq device name
2012-12-10 15:25 [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts Ulf Hansson
2012-12-10 15:25 ` [RESEND PATCH 1/5] cpufreq: Give driver used for dbx500 family a more generic name Ulf Hansson
@ 2012-12-10 15:25 ` Ulf Hansson
2012-12-10 15:25 ` [RESEND PATCH 3/5] cpufreq: dbx500: Move clk_get to probe Ulf Hansson
` (4 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Ulf Hansson @ 2012-12-10 15:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Lee Jones <lee.jones@linaro.org>
Since the cpufreq driver for ux500 has been renamed from
cpufreq-db8500 to cpufreq-dbx500, we need to change the
device name here as well.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
---
drivers/mfd/db8500-prcmu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index b96661d..5214422 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -3062,8 +3062,8 @@ static struct mfd_cell db8500_prcmu_devs[] = {
.pdata_size = sizeof(db8500_regulators),
},
{
- .name = "cpufreq-u8500",
- .of_compatible = "stericsson,cpufreq-u8500",
+ .name = "cpufreq-ux500",
+ .of_compatible = "stericsson,cpufreq-ux500",
.platform_data = &db8500_cpufreq_table,
.pdata_size = sizeof(db8500_cpufreq_table),
},
--
1.7.10
^ permalink raw reply related [flat|nested] 11+ messages in thread* [RESEND PATCH 3/5] cpufreq: dbx500: Move clk_get to probe
2012-12-10 15:25 [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts Ulf Hansson
2012-12-10 15:25 ` [RESEND PATCH 1/5] cpufreq: Give driver used for dbx500 family a more generic name Ulf Hansson
2012-12-10 15:25 ` [RESEND PATCH 2/5] mfd: db8500: Update cpufreq device name Ulf Hansson
@ 2012-12-10 15:25 ` Ulf Hansson
2012-12-10 15:25 ` [RESEND PATCH 4/5] cpufreq: dbx500: Minor code cleanup Ulf Hansson
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Ulf Hansson @ 2012-12-10 15:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Ulf Hansson <ulf.hansson@linaro.org>
The armss clock shall only be fetched at probe thus move this here.
Same thing goes for the printing of the available frequencies.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Jonas Aaberg <jonas.aberg@stericsson.com>
---
drivers/cpufreq/dbx500-cpufreq.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index 0a411b5..d974a8e 100644
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -90,28 +90,14 @@ static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
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("dbx500-cpufreq : Failed to get armss clk\n");
- return PTR_ERR(armss_clk);
- }
-
- 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++;
- }
-
/* get policy fields based on the table */
res = cpufreq_frequency_table_cpuinfo(policy, freq_table);
if (!res)
cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
else {
pr_err("dbx500-cpufreq : Failed to read policy table\n");
- clk_put(armss_clk);
return res;
}
@@ -147,13 +133,26 @@ static struct cpufreq_driver dbx500_cpufreq_driver = {
static int dbx500_cpufreq_probe(struct platform_device *pdev)
{
- freq_table = dev_get_platdata(&pdev->dev);
+ int i = 0;
+ freq_table = dev_get_platdata(&pdev->dev);
if (!freq_table) {
pr_err("dbx500-cpufreq: Failed to fetch cpufreq table\n");
return -ENODEV;
}
+ armss_clk = clk_get(&pdev->dev, "armss");
+ if (IS_ERR(armss_clk)) {
+ pr_err("dbx500-cpufreq : Failed to get armss clk\n");
+ return PTR_ERR(armss_clk);
+ }
+
+ 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++;
+ }
+
return cpufreq_register_driver(&dbx500_cpufreq_driver);
}
--
1.7.10
^ permalink raw reply related [flat|nested] 11+ messages in thread* [RESEND PATCH 4/5] cpufreq: dbx500: Minor code cleanup
2012-12-10 15:25 [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts Ulf Hansson
` (2 preceding siblings ...)
2012-12-10 15:25 ` [RESEND PATCH 3/5] cpufreq: dbx500: Move clk_get to probe Ulf Hansson
@ 2012-12-10 15:25 ` Ulf Hansson
2012-12-10 15:25 ` [RESEND PATCH 5/5] cpufreq: dbx500: Update file header Ulf Hansson
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Ulf Hansson @ 2012-12-10 15:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Jonas Aaberg <jonas.aberg@stericsson.com>
Some minor code cleanup and some minor changes to printed
error messages.
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/cpufreq/dbx500-cpufreq.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index d974a8e..d4cb782 100644
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -36,6 +36,7 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
{
struct cpufreq_freqs freqs;
unsigned int idx;
+ int ret;
/* scale the target frequency to one of the extremes supported */
if (target_freq < policy->cpuinfo.min_freq)
@@ -44,10 +45,9 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
target_freq = policy->cpuinfo.max_freq;
/* Lookup the next frequency */
- if (cpufreq_frequency_table_target
- (policy, freq_table, target_freq, relation, &idx)) {
+ if (cpufreq_frequency_table_target(policy, freq_table, target_freq,
+ relation, &idx))
return -EINVAL;
- }
freqs.old = policy->cur;
freqs.new = freq_table[idx].frequency;
@@ -60,9 +60,12 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy,
cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
/* update armss clk frequency */
- if (clk_set_rate(armss_clk, freq_table[idx].frequency * 1000)) {
- pr_err("dbx500-cpufreq: Failed to update armss clk\n");
- return -EINVAL;
+ ret = clk_set_rate(armss_clk, freqs.new * 1000);
+
+ if (ret) {
+ pr_err("dbx500-cpufreq: Failed to set armss_clk to %d Hz: error %d\n",
+ freqs.new * 1000, ret);
+ return ret;
}
/* post change notification */
@@ -97,7 +100,7 @@ static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)
if (!res)
cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
else {
- pr_err("dbx500-cpufreq : Failed to read policy table\n");
+ pr_err("dbx500-cpufreq: Failed to read policy table\n");
return res;
}
@@ -143,11 +146,11 @@ static int dbx500_cpufreq_probe(struct platform_device *pdev)
armss_clk = clk_get(&pdev->dev, "armss");
if (IS_ERR(armss_clk)) {
- pr_err("dbx500-cpufreq : Failed to get armss clk\n");
+ pr_err("dbx500-cpufreq: Failed to get armss clk\n");
return PTR_ERR(armss_clk);
}
- pr_info("dbx500-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++;
@@ -169,7 +172,6 @@ static int __init dbx500_cpufreq_register(void)
if (!cpu_is_u8500_family())
return -ENODEV;
- pr_info("cpufreq for DBX500 started\n");
return platform_driver_register(&dbx500_cpufreq_plat_driver);
}
device_initcall(dbx500_cpufreq_register);
--
1.7.10
^ permalink raw reply related [flat|nested] 11+ messages in thread* [RESEND PATCH 5/5] cpufreq: dbx500: Update file header
2012-12-10 15:25 [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts Ulf Hansson
` (3 preceding siblings ...)
2012-12-10 15:25 ` [RESEND PATCH 4/5] cpufreq: dbx500: Minor code cleanup Ulf Hansson
@ 2012-12-10 15:25 ` Ulf Hansson
2012-12-11 9:15 ` [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts Linus Walleij
2012-12-12 20:56 ` Mike Turquette
6 siblings, 0 replies; 11+ messages in thread
From: Ulf Hansson @ 2012-12-10 15:25 UTC (permalink / raw)
To: linux-arm-kernel
From: Lee Jones <lee.jones@linaro.org>
Real simple patch to extend the ST-Ericsson copyright date and
remove unnecessary extra commented lines.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/cpufreq/dbx500-cpufreq.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index d4cb782..047fc4f 100644
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -1,13 +1,13 @@
/*
* Copyright (C) STMicroelectronics 2009
- * Copyright (C) ST-Ericsson SA 2010
+ * Copyright (C) ST-Ericsson SA 2010-2012
*
* License Terms: GNU General Public License v2
* Author: Sundar Iyer <sundar.iyer@stericsson.com>
* Author: Martin Persson <martin.persson@stericsson.com>
* Author: Jonas Aaberg <jonas.aberg@stericsson.com>
- *
*/
+
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/cpufreq.h>
--
1.7.10
^ permalink raw reply related [flat|nested] 11+ messages in thread* [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts
2012-12-10 15:25 [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts Ulf Hansson
` (4 preceding siblings ...)
2012-12-10 15:25 ` [RESEND PATCH 5/5] cpufreq: dbx500: Update file header Ulf Hansson
@ 2012-12-11 9:15 ` Linus Walleij
2012-12-12 20:56 ` Mike Turquette
6 siblings, 0 replies; 11+ messages in thread
From: Linus Walleij @ 2012-12-11 9:15 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Dec 10, 2012 at 4:25 PM, Ulf Hansson <ulf.hansson@stericsson.com> wrote:
> From: Ulf Hansson <ulf.hansson@linaro.org>
>
> This patchset starts by renaming the db8500 cpufreq driver to a more generic
> name. There are new variants which rely on it too, so instead we give it a
> family name of dbx500.
>
> On top of that a fixup patch for initialization of the driver and some minor
> cleanup patches are included as well.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
For all patches.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 11+ messages in thread* [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts
2012-12-10 15:25 [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts Ulf Hansson
` (5 preceding siblings ...)
2012-12-11 9:15 ` [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts Linus Walleij
@ 2012-12-12 20:56 ` Mike Turquette
2012-12-12 22:43 ` Rafael J. Wysocki
2012-12-13 9:20 ` Ulf Hansson
6 siblings, 2 replies; 11+ messages in thread
From: Mike Turquette @ 2012-12-12 20:56 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Dec 10, 2012 at 7:25 AM, Ulf Hansson <ulf.hansson@stericsson.com> wrote:
> From: Ulf Hansson <ulf.hansson@linaro.org>
>
> This patchset starts by renaming the db8500 cpufreq driver to a more generic
> name. There are new variants which rely on it too, so instead we give it a
> family name of dbx500.
>
> On top of that a fixup patch for initialization of the driver and some minor
> cleanup patches are included as well.
>
> These patches can be material for 3.8.
>
> Since some patches for the db8500 cpufreq driver has recently been merged
> through Mike Turquette's clk tree, I decided to base these patches on top
> of the clk-next branch. So I hope Mike is fine by merging these patches
> through his tree.
>
> So I will try to collect ACKs from Rafael for the cpufreq patches. The
> mfd patch has already been ACKED by Samuel.
>
Ulf,
Just FYI clk-next has been pulled by Linus for 3.8. I can still take
this branch once Rafael ACKs the CPUfreq bits if you want, but I think
you have more options now that clk-next is merged in. It's up to you.
Regards,
Mike
^ permalink raw reply [flat|nested] 11+ messages in thread* [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts
2012-12-12 20:56 ` Mike Turquette
@ 2012-12-12 22:43 ` Rafael J. Wysocki
2012-12-13 9:20 ` Ulf Hansson
1 sibling, 0 replies; 11+ messages in thread
From: Rafael J. Wysocki @ 2012-12-12 22:43 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday, December 12, 2012 12:56:48 PM Mike Turquette wrote:
> On Mon, Dec 10, 2012 at 7:25 AM, Ulf Hansson <ulf.hansson@stericsson.com> wrote:
> > From: Ulf Hansson <ulf.hansson@linaro.org>
> >
> > This patchset starts by renaming the db8500 cpufreq driver to a more generic
> > name. There are new variants which rely on it too, so instead we give it a
> > family name of dbx500.
> >
> > On top of that a fixup patch for initialization of the driver and some minor
> > cleanup patches are included as well.
> >
> > These patches can be material for 3.8.
> >
> > Since some patches for the db8500 cpufreq driver has recently been merged
> > through Mike Turquette's clk tree, I decided to base these patches on top
> > of the clk-next branch. So I hope Mike is fine by merging these patches
> > through his tree.
> >
> > So I will try to collect ACKs from Rafael for the cpufreq patches. The
> > mfd patch has already been ACKED by Samuel.
> >
>
> Ulf,
>
> Just FYI clk-next has been pulled by Linus for 3.8. I can still take
> this branch once Rafael ACKs the CPUfreq bits if you want, but I think
> you have more options now that clk-next is merged in. It's up to you.
Please regard them as acked.
Thanks,
Rafael
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts
2012-12-12 20:56 ` Mike Turquette
2012-12-12 22:43 ` Rafael J. Wysocki
@ 2012-12-13 9:20 ` Ulf Hansson
2012-12-21 17:18 ` Mike Turquette
1 sibling, 1 reply; 11+ messages in thread
From: Ulf Hansson @ 2012-12-13 9:20 UTC (permalink / raw)
To: linux-arm-kernel
On 12 December 2012 21:56, Mike Turquette <mturquette@linaro.org> wrote:
> On Mon, Dec 10, 2012 at 7:25 AM, Ulf Hansson <ulf.hansson@stericsson.com> wrote:
>> From: Ulf Hansson <ulf.hansson@linaro.org>
>>
>> This patchset starts by renaming the db8500 cpufreq driver to a more generic
>> name. There are new variants which rely on it too, so instead we give it a
>> family name of dbx500.
>>
>> On top of that a fixup patch for initialization of the driver and some minor
>> cleanup patches are included as well.
>>
>> These patches can be material for 3.8.
>>
>> Since some patches for the db8500 cpufreq driver has recently been merged
>> through Mike Turquette's clk tree, I decided to base these patches on top
>> of the clk-next branch. So I hope Mike is fine by merging these patches
>> through his tree.
>>
>> So I will try to collect ACKs from Rafael for the cpufreq patches. The
>> mfd patch has already been ACKED by Samuel.
>>
>
> Ulf,
>
> Just FYI clk-next has been pulled by Linus for 3.8. I can still take
> this branch once Rafael ACKs the CPUfreq bits if you want, but I think
> you have more options now that clk-next is merged in. It's up to you.
I think the easiest way forward (at least for me :-) ) would be if we
could send them as for 3.8 rcs. Is that possible for you Mike?
>
> Regards,
> Mike
Thanks!
Ulf Hansson
^ permalink raw reply [flat|nested] 11+ messages in thread
* [RESEND PATCH 0/5] cpufreq: db8500: Rename driver and update some parts
2012-12-13 9:20 ` Ulf Hansson
@ 2012-12-21 17:18 ` Mike Turquette
0 siblings, 0 replies; 11+ messages in thread
From: Mike Turquette @ 2012-12-21 17:18 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Dec 13, 2012 at 3:20 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:
> On 12 December 2012 21:56, Mike Turquette <mturquette@linaro.org> wrote:
>> On Mon, Dec 10, 2012 at 7:25 AM, Ulf Hansson <ulf.hansson@stericsson.com> wrote:
>>> From: Ulf Hansson <ulf.hansson@linaro.org>
>>>
>>> This patchset starts by renaming the db8500 cpufreq driver to a more generic
>>> name. There are new variants which rely on it too, so instead we give it a
>>> family name of dbx500.
>>>
>>> On top of that a fixup patch for initialization of the driver and some minor
>>> cleanup patches are included as well.
>>>
>>> These patches can be material for 3.8.
>>>
>>> Since some patches for the db8500 cpufreq driver has recently been merged
>>> through Mike Turquette's clk tree, I decided to base these patches on top
>>> of the clk-next branch. So I hope Mike is fine by merging these patches
>>> through his tree.
>>>
>>> So I will try to collect ACKs from Rafael for the cpufreq patches. The
>>> mfd patch has already been ACKED by Samuel.
>>>
>>
>> Ulf,
>>
>> Just FYI clk-next has been pulled by Linus for 3.8. I can still take
>> this branch once Rafael ACKs the CPUfreq bits if you want, but I think
>> you have more options now that clk-next is merged in. It's up to you.
>
> I think the easiest way forward (at least for me :-) ) would be if we
> could send them as for 3.8 rcs. Is that possible for you Mike?
>
Hi Ulf,
I did not want to leave you hanging on this point. I decided at the
last minute to not bring a development platform or a nice laptop on my
vacation so I will not be sending any more pull requests to Linus for
3.8-rc unless some patches come in which are just obvious fixes. Even
then I will wait until I return in January to properly test any fixes
before I send the request out.
Sorry that these patches did not make it in for 3.8 but I will queue
them up into clk-next in January.
Thanks,
Mike
>>
>> Regards,
>> Mike
>
> Thanks!
>
> Ulf Hansson
^ permalink raw reply [flat|nested] 11+ messages in thread