From 9af9731b72c4c7ea11d0dd49f5685870de052e7a Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Sat, 25 Apr 2009 12:52:40 +0000 Subject: [PATCH] --- yaml --- r: 150010 b: refs/heads/master c: 739649c53d7f78f5bf41bdfd1a858ee90c7a687a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/of/base.c | 24 ++++++++++++++++++++++++ trunk/include/linux/of.h | 3 +++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d42b764394ef..f6f46a3a7ccf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edf391ff17232f097d72441c9ad467bcb3b5db18 +refs/heads/master: 739649c53d7f78f5bf41bdfd1a858ee90c7a687a diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c index 41c5dfd85358..ddf224d456b2 100644 --- a/trunk/drivers/of/base.c +++ b/trunk/drivers/of/base.c @@ -494,6 +494,30 @@ int of_modalias_node(struct device_node *node, char *modalias, int len) } EXPORT_SYMBOL_GPL(of_modalias_node); +/** + * of_parse_phandle - Resolve a phandle property to a device_node pointer + * @np: Pointer to device node holding phandle property + * @phandle_name: Name of property holding a phandle value + * @index: For properties holding a table of phandles, this is the index into + * the table + * + * Returns the device_node pointer with refcount incremented. Use + * of_node_put() on it when done. + */ +struct device_node * +of_parse_phandle(struct device_node *np, const char *phandle_name, int index) +{ + const phandle *phandle; + int size; + + phandle = of_get_property(np, phandle_name, &size); + if ((!phandle) || (size < sizeof(*phandle) * (index + 1))) + return NULL; + + return of_find_node_by_phandle(phandle[index]); +} +EXPORT_SYMBOL(of_parse_phandle); + /** * of_parse_phandles_with_args - Find a node pointed by phandle in a list * @np: pointer to a device tree node containing a list diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h index 6a7efa242f5e..7be2d1043c16 100644 --- a/trunk/include/linux/of.h +++ b/trunk/include/linux/of.h @@ -77,6 +77,9 @@ 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 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, const char *list_name, const char *cells_name, int index, struct device_node **out_node, const void **out_args);