Merge git://git.denx.de/u-boot-dm

- MPC83xx device tree additions (CPU and RAM)
- Fix sandbox build error
- Sync bitrev with Linux
- Various ofnode/DT improvements

3 files changed, 31 insertions, 0 deletions

diff --git a/include/dm/of_access.h b/include/dm/of_access.h
index dd1abb8e97b..5ed1a0cdb42 100644
--- a/include/dm/of_access.h
+++ b/include/dm/of_access.h
@@ -194,6 +194,22 @@ struct device_node *of_find_compatible_node(struct device_node *from,
 				const char *type, const char *compatible);
 
 /**
+ * of_find_node_by_prop_value() - find a node with a given property value
+ *
+ * Find a node based on a property value.
+ * @from: 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.
+ * @propname: property name to check
+ * @propval: property value to search for
+ * @proplen: length of the value in propval
+ * @return node pointer or NULL if not found
+ */
+struct device_node *of_find_node_by_prop_value(struct device_node *from,
+					       const char *propname,
+					       const void *propval,
+					       int proplen);
+/**
  * of_find_node_by_phandle() - Find a node given a phandle
  *
  * @handle:	phandle of the node to find
diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index ab36b74c4ca..c06d77849c7 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -703,6 +703,20 @@ int ofnode_read_resource_byname(ofnode node, const char *name,
 ofnode ofnode_by_compatible(ofnode from, const char *compat);
 
 /**
+ * ofnode_by_prop_value() - Find the next node with given property value
+ *
+ * Find the next node after @from that has a @propname with a value
+ * @propval and a length @proplen.
+ *
+ * @from: ofnode to start from (use ofnode_null() to start at the
+ * beginning) @propname: property name to check @propval: property value to
+ * search for @proplen: length of the value in propval @return ofnode
+ * found, or ofnode_null() if none
+ */
+ofnode ofnode_by_prop_value(ofnode from, const char *propname,
+			    const void *propval, int proplen);
+
+/**
  * ofnode_for_each_subnode() - iterate over all subnodes of a parent
  *
  * @node:       child node (ofnode, lvalue)
diff --git a/include/dm/uclass.h b/include/dm/uclass.h
index 0e882cec59c..6e7c1cd3e8b 100644
--- a/include/dm/uclass.h
+++ b/include/dm/uclass.h
@@ -58,6 +58,7 @@ struct udevice;
  * @post_probe: Called after a new device is probed
  * @pre_remove: Called before a device is removed
  * @child_post_bind: Called after a child is bound to a device in this uclass
+ * @child_pre_probe: Called before a child is probed in this uclass
  * @init: Called to set up the uclass
  * @destroy: Called to destroy the uclass
  * @priv_auto_alloc_size: If non-zero this is the size of the private data