Merge remote-tracking branch 'dt-rh/for-next'

Conflicts:
	drivers/of/base.c
	include/linux/of.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/of/base.c
index 4a8d46ffb0ecf9349084df7ef5ad36699b258fae,e2e813624df5980d0f3995cffd3b356e839058ca..38892a9f5400097973f8abfa536bd6ae6caafc39
--- 1/drivers/of/base.c
--- 2/drivers/of/base.c
+++ b/drivers/of/base.c
@@@ -363,33 -363,29 +363,56 @@@ struct device_node *of_get_next_child(c
  }
  EXPORT_SYMBOL(of_get_next_child);
  
 +/**
 + *    of_get_next_available_child - Find the next available child node
 + *    @node:  parent node
 + *    @prev:  previous child of the parent node, or NULL to get first
 + *
 + *      This function is like of_get_next_child(), except that it
 + *      automatically skips any disabled nodes (i.e. status = "disabled").
 + */
 +struct device_node *of_get_next_available_child(const struct device_node *node,
 +      struct device_node *prev)
 +{
 +      struct device_node *next;
 +
 +      read_lock(&devtree_lock);
 +      next = prev ? prev->sibling : node->child;
 +      for (; next; next = next->sibling) {
 +              if (!of_device_is_available(next))
 +                      continue;
 +              if (of_node_get(next))
 +                      break;
 +      }
 +      of_node_put(prev);
 +      read_unlock(&devtree_lock);
 +      return next;
 +}
 +EXPORT_SYMBOL(of_get_next_available_child);
 +
+ /**
+  *    of_get_child_by_name - Find the child node by name for a given parent
+  *    @node:  parent node
+  *    @name:  child name to look for.
+  *
+  *      This function looks for child node for given matching name
+  *
+  *    Returns a node pointer if found, with refcount incremented, use
+  *    of_node_put() on it when done.
+  *    Returns NULL if node is not found.
+  */
+ struct device_node *of_get_child_by_name(const struct device_node *node,
+                               const char *name)
+ {
+       struct device_node *child;
+ 
+       for_each_child_of_node(node, child)
+               if (child->name && (of_node_cmp(child->name, name) == 0))
+                       break;
+       return child;
+ }
+ EXPORT_SYMBOL(of_get_child_by_name);
+ 
  /**
   *    of_find_node_by_path - Find a node matching a full OF path
   *    @path:  The full path to match

diff --cc drivers/spi/spi-s3c64xx.c
Simple merge

diff --cc include/linux/of.h
index 5c7a15836996e92dd3c5fe33cf2161c95d3b16bf,fabb524d3d755e029536c518a447b9a5dd979753..72843b72a2b2619a5343be071d1ad104a9cb75af
--- 1/include/linux/of.h
--- 2/include/linux/of.h
+++ b/include/linux/of.h
@@@ -190,9 -190,8 +190,11 @@@ extern struct device_node *of_get_paren
  extern struct device_node *of_get_next_parent(struct device_node *node);
  extern struct device_node *of_get_next_child(const struct device_node *node,
                                             struct device_node *prev);
 +extern struct device_node *of_get_next_available_child(
 +      const struct device_node *node, struct device_node *prev);
 +
+ extern struct device_node *of_get_child_by_name(const struct device_node *node,
+                                       const char *name);
  #define for_each_child_of_node(parent, child) \
        for (child = of_get_next_child(parent, NULL); child != NULL; \
             child = of_get_next_child(parent, child))