aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/of.h
diff options
context:
space:
mode:
authorPantelis Antoniou <pantelis.antoniou@konsulko.com>2015-04-24 12:41:56 +0300
committerRob Herring <robh@kernel.org>2015-05-28 09:00:16 -0500
commit391b459d7623b26153c7d8c200e8d213440a7d48 (patch)
tree1def5aac7d92b190b79c4e1fbc7774df2c10c356 /include/linux/of.h
parentscripts/dtc: Update to upstream version 9d3649bd3be245c9 (diff)
downloadlinux-dev-391b459d7623b26153c7d8c200e8d213440a7d48.tar.xz
linux-dev-391b459d7623b26153c7d8c200e8d213440a7d48.zip
of: Move OF flags to be visible even when !CONFIG_OF
We need those to be visible even when compiling with CONFIG_OF disabled, since even the empty of_node_*_flag() method use the flag. Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com> Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'include/linux/of.h')
-rw-r--r--include/linux/of.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/of.h b/include/linux/of.h
index ddeaae6d2083..9b32cbdf0230 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -120,6 +120,12 @@ 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 */
+
#ifdef CONFIG_OF
static inline bool is_of_node(struct fwnode_handle *fwnode)
{
@@ -217,12 +223,6 @@ 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)