summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-02-13 09:26:04 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-02-13 09:26:04 +0100
commit5a30fae8c7d437d610348e5f05153e60f086c0c2 (patch)
tree23981fe796cf11854a35a16f01ea0a4b82aa37bb
parent2cd2bad2b79a9dbd03ba655a4a04fcaa602eac2b (diff)
parented6620e7e20a292f4ab44ca6519df66d054d4ac4 (diff)
downloadbarebox-5a30fae8c7d437d610348e5f05153e60f086c0c2.tar.gz
Merge branch 'for-next/mvebu'
-rw-r--r--drivers/bus/mvebu-mbus.c2
-rw-r--r--include/of.h6
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index 735fa32..df5f7a3 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -754,7 +754,7 @@ static int mvebu_mbus_of_fixup(struct device_node *root, void *context)
{
struct device_node *np;
- for_each_matching_node(np, mvebu_mbus_dt_ids) {
+ for_each_matching_node_from(np, root, mvebu_mbus_dt_ids) {
struct property *p;
int n, pa, na, ns, lenp, size;
u32 *ranges;
diff --git a/include/of.h b/include/of.h
index ed6e870..e3bb452 100644
--- a/include/of.h
+++ b/include/of.h
@@ -665,9 +665,11 @@ static inline struct device_node *of_find_matching_node(
{
return of_find_matching_node_and_match(from, matches, NULL);
}
-#define for_each_matching_node(dn, matches) \
- for (dn = of_find_matching_node(NULL, matches); dn; \
+#define for_each_matching_node_from(dn, root, matches) \
+ for (dn = of_find_matching_node(root, matches); dn; \
dn = of_find_matching_node(dn, matches))
+#define for_each_matching_node(dn, matches) \
+ for_each_matching_node_from(dn, NULL, matches)
#define for_each_matching_node_and_match(dn, matches, match) \
for (dn = of_find_matching_node_and_match(NULL, matches, match); \
dn; dn = of_find_matching_node_and_match(dn, matches, match))