lkml.org 
[lkml]   [2013]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the regulator tree with the pm tree
Hi all,

Today's linux-next merge of the regulator tree got a conflict in
drivers/cpufreq/cpufreq-cpu0.c between commit f837a9b5ab05 ("cpufreq:
cpufreq-cpu0: remove device tree parsing for cpu nodes") from the tree
and commit 7d748971c0c0 ("cpufreq: cpufreq-cpu0: Use
devm_regulator_get_optional()") from the regulator tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/cpufreq/cpufreq-cpu0.c
index bad620e,e9dedb2..0000000
--- a/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@@ -174,18 -174,30 +174,18 @@@ static struct cpufreq_driver cpu0_cpufr

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");
- 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_reg = devm_regulator_get(cpu_dev, "cpu0");
- cpu_dev = &pdev->dev;
- cpu_dev->of_node = np;
-
+ cpu_reg = devm_regulator_get_optional(cpu_dev, "cpu0");
if (IS_ERR(cpu_reg)) {
/*
* If cpu0 regulator supply node is present, but regulator is
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-08-27 08:01    [W:0.035 / U:0.472 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site