--- v3
+++ v2
@@ -5,67 +5,46 @@
This patch removes all DT parsing and uses cpu->of_node instead.
-Acked-by: Shawn Guo <shawn.guo@linaro.org>
-Acked-by: Rob Herring <rob.herring@calxeda.com>
+Cc: Mark Langsdorf <mark.langsdorf@calxeda.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
---
- drivers/cpufreq/cpufreq-cpu0.c | 23 ++++-------------------
- 1 file changed, 4 insertions(+), 19 deletions(-)
+ drivers/cpufreq/highbank-cpufreq.c | 18 ++++++------------
+ 1 file changed, 6 insertions(+), 12 deletions(-)
-diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
-index ad1fde2..5b05c26 100644
---- a/drivers/cpufreq/cpufreq-cpu0.c
-+++ b/drivers/cpufreq/cpufreq-cpu0.c
-@@ -174,29 +174,17 @@ static struct cpufreq_driver cpu0_cpufreq_driver = {
+diff --git a/drivers/cpufreq/highbank-cpufreq.c b/drivers/cpufreq/highbank-cpufreq.c
+index b61b5a3..794123f 100644
+--- a/drivers/cpufreq/highbank-cpufreq.c
++++ b/drivers/cpufreq/highbank-cpufreq.c
+@@ -69,23 +69,17 @@ static int hb_cpufreq_driver_init(void)
+ if (!of_machine_is_compatible("calxeda,highbank"))
+ return -ENODEV;
- static int cpu0_cpufreq_probe(struct platform_device *pdev)
- {
-- struct device_node *np, *parent;
-+ struct device_node *np;
- int ret;
-
-- parent = of_find_node_by_path("/cpus");
-- if (!parent) {
-- pr_err("failed to find OF /cpus\n");
+- for_each_child_of_node(of_find_node_by_path("/cpus"), np)
+- if (of_get_property(np, "operating-points", NULL))
+- break;
+-
+- if (!np) {
+- pr_err("failed to find highbank cpufreq node\n");
- return -ENOENT;
- }
-
-- for_each_child_of_node(parent, np) {
-- if (of_get_property(np, "operating-points", NULL))
-- break;
-- }
-+ cpu_dev = &pdev->dev;
-
-+ np = of_node_get(cpu_dev->of_node);
- if (!np) {
- pr_err("failed to find cpu0 node\n");
-- ret = -ENOENT;
-- goto out_put_parent;
-+ return -ENOENT;
+ cpu_dev = get_cpu_device(0);
+ if (!cpu_dev) {
+ pr_err("failed to get highbank cpufreq device\n");
+- ret = -ENODEV;
+- goto out_put_node;
++ return -ENODEV;
}
-- cpu_dev = &pdev->dev;
- cpu_dev->of_node = np;
--
- cpu_reg = devm_regulator_get(cpu_dev, "cpu0");
- if (IS_ERR(cpu_reg)) {
- /*
-@@ -269,15 +257,12 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev)
- }
++ np = of_node_get(cpu_dev->of_node);
++ if (!np) {
++ pr_err("failed to find highbank cpufreq node\n");
++ return -ENOENT;
++ }
- of_node_put(np);
-- of_node_put(parent);
- return 0;
-
- out_free_table:
- opp_free_cpufreq_table(cpu_dev, &freq_table);
- out_put_node:
- of_node_put(np);
--out_put_parent:
-- of_node_put(parent);
- return ret;
- }
-
+ cpu_clk = clk_get(cpu_dev, NULL);
+ if (IS_ERR(cpu_clk)) {
--
1.8.1.2