Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[linux-drm-fsl-dcu.git] / include / linux / of.h

diff --git a/include/linux/of.h b/include/linux/of.h
index 87d08306fef4b4e3fb0826251d4fda74793008e9..f95aee391e30fcb98eeec0f6569c0b4bc9b8ba31 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -266,6 +266,7 @@ extern int of_device_is_available(const struct device_node *device);
 extern const void *of_get_property(const struct device_node *node,
                                const char *name,
                                int *lenp);
+extern struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);
 #define for_each_property_of_node(dn, pp) \
        for (pp = dn->properties; pp != NULL; pp = pp->next)
 
@@ -335,6 +336,8 @@ const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,
  */
 const char *of_prop_next_string(struct property *prop, const char *cur);
 
+int of_device_is_stdout_path(struct device_node *dn);
+
 #else /* CONFIG_OF */
 
 static inline const char* of_node_full_name(struct device_node *np)
@@ -451,6 +454,12 @@ static inline const void *of_get_property(const struct device_node *node,
        return NULL;
 }
 
+static inline struct device_node *of_get_cpu_node(int cpu,
+                                       unsigned int *thread)
+{
+       return NULL;
+}
+
 static inline int of_property_read_u64(const struct device_node *np,
                                       const char *propname, u64 *out_value)
 {
@@ -504,6 +513,11 @@ static inline int of_machine_is_compatible(const char *compat)
        return 0;
 }
 
+static inline int of_device_is_stdout_path(struct device_node *dn)
+{
+       return 0;
+}
+
 static inline const __be32 *of_prop_next_u32(struct property *prop,
                const __be32 *cur, u32 *pu)
 {