On 08/05/2013 07:40 AM, Sascha Hauer wrote: > devicetrees may have a linux,stdout-path property in the chosen > node describing the console device. This adds a helper function > to match a device against this property so a driver can call > add_preferred_console for a matching device. > > Signed-off-by: Sascha Hauer <[email protected]>
Acked-by: Rob Herring <[email protected]> There are no existing users that could take advantage of this? Rob > --- > drivers/of/base.c | 26 ++++++++++++++++++++++++++ > include/linux/of.h | 7 +++++++ > 2 files changed, 33 insertions(+) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index 5c54279..1c3c79c 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -32,6 +32,7 @@ struct device_node *of_allnodes; > EXPORT_SYMBOL(of_allnodes); > struct device_node *of_chosen; > struct device_node *of_aliases; > +static struct device_node *of_stdout; > > DEFINE_MUTEX(of_aliases_mutex); > > @@ -1595,6 +1596,15 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 > align)) > of_chosen = of_find_node_by_path("/chosen"); > if (of_chosen == NULL) > of_chosen = of_find_node_by_path("/chosen@0"); > + > + if (of_chosen) { > + const char *name; > + > + name = of_get_property(of_chosen, "linux,stdout-path", NULL); > + if (name) > + of_stdout = of_find_node_by_path(name); > + } > + > of_aliases = of_find_node_by_path("/aliases"); > if (!of_aliases) > return; > @@ -1703,3 +1713,19 @@ const char *of_prop_next_string(struct property *prop, > const char *cur) > return curv; > } > EXPORT_SYMBOL_GPL(of_prop_next_string); > + > +/** > + * of_device_is_stdout_path - check if a device node matches the > + * linux,stdout-path property > + * > + * Check if this device node matches the linux,stdout-path property > + * in the chosen node. return true if yes, false otherwise. > + */ > +int of_device_is_stdout_path(struct device_node *dn) > +{ > + if (!of_stdout) > + return false; > + > + return of_stdout == dn; > +} > +EXPORT_SYMBOL_GPL(of_device_is_stdout_path); > diff --git a/include/linux/of.h b/include/linux/of.h > index 1fd08ca..429e168 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -343,6 +343,8 @@ const char *of_prop_next_string(struct property *prop, > const char *cur); > s; \ > s = of_prop_next_string(prop, s)) > > +int of_device_is_stdout_path(struct device_node *dn); > + > #else /* CONFIG_OF */ > > static inline const char* of_node_full_name(struct device_node *np) > @@ -505,6 +507,11 @@ static inline int of_machine_is_compatible(const char > *compat) > return 0; > } > > +static inline int of_device_is_stdout_path(struct device_node *dn) > +{ > + return 0; > +} > + > #define of_match_ptr(_ptr) NULL > #define of_match_node(_matches, _node) NULL > #define of_property_for_each_u32(np, propname, prop, p, u) \ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
