* linux-next: manual merge of the dt-rh tree with the regulator tree
@ 2015-10-16 3:07 Stephen Rothwell
2015-10-16 14:47 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2015-10-16 3:07 UTC (permalink / raw)
To: Rob Herring, Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Tomeu Vizoso
Hi Rob,
Today's linux-next merge of the dt-rh tree got a conflict in:
drivers/regulator/core.c
between commit:
85f3b4311629 ("regulator: core: Remove regulator_list")
from the regulator tree and commit:
5634acd9c8e3 ("regulator: core: Probe regulators on demand")
from the dt-rh tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/regulator/core.c
index 7896ef53ff86,c2e5c2ae85c1..000000000000
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@ -1421,9 -1341,11 +1422,10 @@@ static struct regulator_dev *regulator_
if (dev && dev->of_node) {
node = of_get_regulator(dev, supply);
if (node) {
+ of_device_probe(node);
- list_for_each_entry(r, ®ulator_list, list)
- if (r->dev.parent &&
- node == r->dev.of_node)
- return r;
+ r = of_find_regulator_by_node(node);
+ if (r)
+ return r;
*ret = -EPROBE_DEFER;
return NULL;
} else {
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the dt-rh tree with the regulator tree
2015-10-16 3:07 linux-next: manual merge of the dt-rh tree with the regulator tree Stephen Rothwell
@ 2015-10-16 14:47 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2015-10-16 14:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rob Herring, Liam Girdwood, linux-next, linux-kernel, Tomeu Vizoso
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
On Fri, Oct 16, 2015 at 02:07:04PM +1100, Stephen Rothwell wrote:
> 5634acd9c8e3 ("regulator: core: Probe regulators on demand")
> from the dt-rh tree.
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).
Yes, that looks about right.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-16 14:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-16 3:07 linux-next: manual merge of the dt-rh tree with the regulator tree Stephen Rothwell
2015-10-16 14:47 ` 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).