From 4a3572d9003c9ca0c165a44cefa74a878960073b Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 12 Nov 2008 18:54:42 +0000
Subject: [PATCH] --- yaml --- r: 123031 b: refs/heads/master c:
 1e291b14c8f1101b9093434489bd4dc0e03f3d0f h: refs/heads/master i:   123029:
 065bf40355fef0871d68acdb795f40b57090b65f   123027:
 34a82f892d3c97d38454217001d48393eb2bd81b   123023:
 d345339532b734ddf31a5c634848b1cfc85b7723 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/of/base.c  | 35 +++++++++++++++++++++++++++++++++++
 trunk/include/linux/of.h |  6 ++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0c9245fb92e0..57003306414a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae564c63b8311fa73c21e456e00dba1f4b1ff6bc
+refs/heads/master: 1e291b14c8f1101b9093434489bd4dc0e03f3d0f
diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c
index 7c79e94a35ea..4f884a358a7b 100644
--- a/trunk/drivers/of/base.c
+++ b/trunk/drivers/of/base.c
@@ -328,6 +328,41 @@ struct device_node *of_find_compatible_node(struct device_node *from,
 }
 EXPORT_SYMBOL(of_find_compatible_node);
 
+/**
+ *	of_find_node_with_property - Find a node which has a property with
+ *                                   the given name.
+ *	@from:		The node to start searching from or NULL, the node
+ *			you pass will not be searched, only the next one
+ *			will; typically, you pass what the previous call
+ *			returned. of_node_put() will be called on it
+ *	@prop_name:	The name of the property to look for.
+ *
+ *	Returns a node pointer with refcount incremented, use
+ *	of_node_put() on it when done.
+ */
+struct device_node *of_find_node_with_property(struct device_node *from,
+	const char *prop_name)
+{
+	struct device_node *np;
+	struct property *pp;
+
+	read_lock(&devtree_lock);
+	np = from ? from->allnext : allnodes;
+	for (; np; np = np->allnext) {
+		for (pp = np->properties; pp != 0; pp = pp->next) {
+			if (of_prop_cmp(pp->name, prop_name) == 0) {
+				of_node_get(np);
+				goto out;
+			}
+		}
+	}
+out:
+	of_node_put(from);
+	read_unlock(&devtree_lock);
+	return np;
+}
+EXPORT_SYMBOL(of_find_node_with_property);
+
 /**
  * of_match_node - Tell if an device_node has a matching of_match structure
  *	@matches:	array of of device match structures to search in
diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
index e2488f5e7cb2..6a7efa242f5e 100644
--- a/trunk/include/linux/of.h
+++ b/trunk/include/linux/of.h
@@ -57,6 +57,12 @@ extern struct device_node *of_get_next_child(const struct device_node *node,
 	for (child = of_get_next_child(parent, NULL); child != NULL; \
 	     child = of_get_next_child(parent, child))
 
+extern struct device_node *of_find_node_with_property(
+	struct device_node *from, const char *prop_name);
+#define for_each_node_with_property(dn, prop_name) \
+	for (dn = of_find_node_with_property(NULL, prop_name); dn; \
+	     dn = of_find_node_with_property(dn, prop_name))
+
 extern struct property *of_find_property(const struct device_node *np,
 					 const char *name,
 					 int *lenp);