These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / include / linux / of.h

diff --git a/kernel/include/linux/of.h b/kernel/include/linux/of.h
index 8135d50..dd10626 100644 (file)
--- a/kernel/include/linux/of.h
+++ b/kernel/include/linux/of.h
@@ -120,6 +120,14 @@ extern struct device_node *of_aliases;
 extern struct device_node *of_stdout;
 extern raw_spinlock_t devtree_lock;
 
+/* flag descriptions (need to be visible even when !CONFIG_OF) */
+#define OF_DYNAMIC     1 /* node and properties were allocated via kmalloc */
+#define OF_DETACHED    2 /* node has been detached from the device tree */
+#define OF_POPULATED   3 /* device already created for the node */
+#define OF_POPULATED_BUS       4 /* of_platform_populate recursed to children of this node */
+
+#define OF_BAD_ADDR    ((u64)-1)
+
 #ifdef CONFIG_OF
 void of_core_init(void);
 
@@ -128,9 +136,10 @@ static inline bool is_of_node(struct fwnode_handle *fwnode)
        return fwnode && fwnode->type == FWNODE_OF;
 }
 
-static inline struct device_node *of_node(struct fwnode_handle *fwnode)
+static inline struct device_node *to_of_node(struct fwnode_handle *fwnode)
 {
-       return fwnode ? container_of(fwnode, struct device_node, fwnode) : NULL;
+       return is_of_node(fwnode) ?
+               container_of(fwnode, struct device_node, fwnode) : NULL;
 }
 
 static inline bool of_have_populated_dt(void)
@@ -219,17 +228,9 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size)
 #define of_node_cmp(s1, s2)            strcasecmp((s1), (s2))
 #endif
 
-/* flag descriptions */
-#define OF_DYNAMIC     1 /* node and properties were allocated via kmalloc */
-#define OF_DETACHED    2 /* node has been detached from the device tree */
-#define OF_POPULATED   3 /* device already created for the node */
-#define OF_POPULATED_BUS       4 /* of_platform_populate recursed to children of this node */
-
 #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)
 #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)
 
-#define OF_BAD_ADDR    ((u64)-1)
-
 static inline const char *of_node_full_name(const struct device_node *np)
 {
        return np ? np->full_name : "<no-node>";
@@ -387,7 +388,7 @@ static inline bool is_of_node(struct fwnode_handle *fwnode)
        return false;
 }
 
-static inline struct device_node *of_node(struct fwnode_handle *fwnode)
+static inline struct device_node *to_of_node(struct fwnode_handle *fwnode)
 {
        return NULL;
 }
@@ -428,6 +429,11 @@ static inline struct device_node *of_find_node_opts_by_path(const char *path,
        return NULL;
 }
 
+static inline struct device_node *of_find_node_by_phandle(phandle handle)
+{
+       return NULL;
+}
+
 static inline struct device_node *of_get_parent(const struct device_node *node)
 {
        return NULL;
@@ -824,7 +830,7 @@ static inline int of_property_read_string_index(struct device_node *np,
  * @propname:  name of the property to be searched.
  *
  * Search for a property in a device node.
- * Returns true if the property exist false otherwise.
+ * Returns true if the property exists false otherwise.
  */
 static inline bool of_property_read_bool(const struct device_node *np,
                                         const char *propname)