* linux-next: manual merge of the regulator tree with the pm tree
@ 2013-08-27 5:37 Stephen Rothwell
2013-08-27 21:10 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-08-27 5:37 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Sudeep KarkadaNagesha,
Rafael J. Wysocki, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the regulator tree with the pm tree
2013-08-27 5:37 linux-next: manual merge of the regulator tree with the pm tree Stephen Rothwell
@ 2013-08-27 21:10 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2013-08-27 21:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Liam Girdwood, linux-next, linux-kernel, Sudeep KarkadaNagesha,
Rafael J. Wysocki, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
On Tue, Aug 27, 2013 at 03:37:54PM +1000, Stephen Rothwell wrote:
> 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).
The resolution looks good to me.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-27 21:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-27 5:37 linux-next: manual merge of the regulator tree with the pm tree Stephen Rothwell
2013-08-27 21:10 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).