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

[linux-beck.git] / include / linux / of.h

diff --git a/include/linux/of.h b/include/linux/of.h
index 9abd3ec3c2ac1e54a53cc2d2961d92ecda679a89..a75a831e2057f96e3519d100f988a584e18ac669 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -65,6 +65,13 @@ struct device_node {
 #endif
 };
 
+#define MAX_PHANDLE_ARGS 8
+struct of_phandle_args {
+       struct device_node *np;
+       int args_count;
+       uint32_t args[MAX_PHANDLE_ARGS];
+};
+
 #if defined(CONFIG_SPARC) || !defined(CONFIG_OF)
 /* Dummy ref counting routines - to be implemented later */
 static inline struct device_node *of_node_get(struct device_node *node)
@@ -229,9 +236,9 @@ extern int of_modalias_node(struct device_node *node, char *modalias, int len);
 extern struct device_node *of_parse_phandle(struct device_node *np,
                                            const char *phandle_name,
                                            int index);
-extern int of_parse_phandles_with_args(struct device_node *np,
+extern int of_parse_phandle_with_args(struct device_node *np,
        const char *list_name, const char *cells_name, int index,
-       struct device_node **out_node, const void **out_args);
+       struct of_phandle_args *out_args);
 
 extern void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align));
 extern int of_alias_get_id(struct device_node *np, const char *stem);