Merge branch 'dt/property-move' into dt/next

2 files changed, 41 insertions, 10 deletions

diff --git a/include/linux/of.h b/include/linux/of.h
index c72ba9437a43..fa089a2789a0 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -148,18 +148,28 @@ extern raw_spinlock_t devtree_lock;
 #ifdef CONFIG_OF
 void of_core_init(void);
 
-static inline bool is_of_node(struct fwnode_handle *fwnode)
+static inline bool is_of_node(const struct fwnode_handle *fwnode)
 {
         return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_OF;
 }
 
-static inline struct device_node *to_of_node(struct fwnode_handle *fwnode)
-{
-        return is_of_node(fwnode) ?
-                container_of(fwnode, struct device_node, fwnode) : NULL;
-}
-
-#define of_fwnode_handle(node) (&(node)->fwnode)
+#define to_of_node(__fwnode)                                            \
+        ({                                                              \
+                typeof(__fwnode) __to_of_node_fwnode = (__fwnode);      \
+                                                                        \
+                is_of_node(__to_of_node_fwnode) ?                       \
+                        container_of(__to_of_node_fwnode,               \
+                                     struct device_node, fwnode) :      \
+                        NULL;                                           \
+        })
+
+#define of_fwnode_handle(node)                                          \
+        ({                                                              \
+                typeof(node) __of_fwnode_handle_node = (node);          \
+                                                                        \
+                __of_fwnode_handle_node ?                               \
+                        &__of_fwnode_handle_node->fwnode : NULL;        \
+        })
 
 static inline bool of_have_populated_dt(void)
 {
@@ -533,12 +543,12 @@ static inline void of_core_init(void)
 {
 }
 
-static inline bool is_of_node(struct fwnode_handle *fwnode)
+static inline bool is_of_node(const struct fwnode_handle *fwnode)
 {
         return false;
 }
 
-static inline struct device_node *to_of_node(struct fwnode_handle *fwnode)
+static inline struct device_node *to_of_node(const struct fwnode_handle *fwnode)
 {
         return NULL;
 }
diff --git a/include/linux/of_graph.h b/include/linux/of_graph.h
index abdb02eaef06..3e058f05ab04 100644
--- a/include/linux/of_graph.h
+++ b/include/linux/of_graph.h
@@ -43,11 +43,15 @@ struct of_endpoint {
 #ifdef CONFIG_OF
 int of_graph_parse_endpoint(const struct device_node *node,
                                 struct of_endpoint *endpoint);
+int of_graph_get_endpoint_count(const struct device_node *np);
 struct device_node *of_graph_get_port_by_id(struct device_node *node, u32 id);
 struct device_node *of_graph_get_next_endpoint(const struct device_node *parent,
                                         struct device_node *previous);
 struct device_node *of_graph_get_endpoint_by_regs(
                 const struct device_node *parent, int port_reg, int reg);
+struct device_node *of_graph_get_remote_endpoint(
+                                        const struct device_node *node);
+struct device_node *of_graph_get_port_parent(struct device_node *node);
 struct device_node *of_graph_get_remote_port_parent(
                                         const struct device_node *node);
 struct device_node *of_graph_get_remote_port(const struct device_node *node);
@@ -61,6 +65,11 @@ static inline int of_graph_parse_endpoint(const struct device_node *node,
         return -ENOSYS;
 }
 
+static inline int of_graph_get_endpoint_count(const struct device_node *np)
+{
+        return 0;
+}
+
 static inline struct device_node *of_graph_get_port_by_id(
                                         struct device_node *node, u32 id)
 {
@@ -80,6 +89,18 @@ static inline struct device_node *of_graph_get_endpoint_by_regs(
         return NULL;
 }
 
+static inline struct device_node *of_graph_get_remote_endpoint(
+                                        const struct device_node *node)
+{
+        return NULL;
+}
+
+static inline struct device_node *of_graph_get_port_parent(
+        struct device_node *node)
+{
+        return NULL;
+}
+
 static inline struct device_node *of_graph_get_remote_port_parent(
                                         const struct device_node *node)
 {