Add of_match_machine function to test the device tree root for an
of_match array. This can be useful when testing SoC versions at runtime,
for example.
Signed-off-by: Tuomas Tynkkynen <ttynkkynen@xxxxxxxxxx>
---
drivers/of/base.c | 21 +++++++++++++++++++++
include/linux/of.h | 3 +++
2 files changed, 24 insertions(+)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index d8574ad..37798ea 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -977,6 +977,27 @@ struct device_node *of_find_matching_node_and_match(struct device_node *from,
EXPORT_SYMBOL(of_find_matching_node_and_match);
/**
+ * of_match_machine - Tell if root of device tree has a matching of_match struct
+ * @matches: array of of device match structures to search in
+ *
+ * Returns the result of of_match_node for the root node.
+ */
+const struct of_device_id *of_match_machine(const struct of_device_id *matches)
+{
+ const struct of_device_id *match;
+ struct device_node *root;
+
+ root = of_find_node_by_path("/");
+ if (!root)
+ return NULL;
+
+ match = of_match_node(matches, root);
+ of_node_put(root);
+ return match;
+}
+EXPORT_SYMBOL(of_match_machine);
+
+/**
* of_modalias_node - Lookup appropriate modalias for a device node
* @node: pointer to a device tree node
* @modalias: Pointer to buffer that modalias value will be copied into
diff --git a/include/linux/of.h b/include/linux/of.h
index 6c4363b..b7a8817 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -289,6 +289,8 @@ extern int of_n_addr_cells(struct device_node *np);
extern int of_n_size_cells(struct device_node *np);
extern const struct of_device_id *of_match_node(
const struct of_device_id *matches, const struct device_node *node);
+extern const struct of_device_id *of_match_machine(
+ const struct of_device_id *matches);
extern int of_modalias_node(struct device_node *node, char *modalias, int len);
extern void of_print_phandle_args(const char *msg, const struct of_phandle_args *args);
extern struct device_node *of_parse_phandle(const struct device_node *np,
@@ -584,6 +586,7 @@ static inline const char *of_prop_next_string(struct property *prop,
#define of_match_ptr(_ptr) NULL
#define of_match_node(_matches, _node) NULL
+#define of_match_machine(_matches) NULL
#endif /* CONFIG_OF */
#if defined(CONFIG_OF) && defined(CONFIG_NUMA)
--
1.8.1.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
