mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 23:58:05 +00:00
Code Issues Releases Wiki Activity

OF: Add helper for matching against linux,stdout-path

Browse source 
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 <s.hauer@pengutronix.de>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sascha Hauer 2013-08-05 14:40:44 +02:00 committed by Greg Kroah-Hartman
parent a324e4de0c
commit 5c19e95216
2 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/of/base.c
View file

@ -32,6 +32,7 @@ struct device_node *of_allnodes;
EXPORT_SYMBOL(of_allnodes); EXPORT_SYMBOL(of_allnodes);
struct device_node *of_chosen; struct device_node *of_chosen;
struct device_node *of_aliases; struct device_node *of_aliases;
static struct device_node *of_stdout;
DEFINE_MUTEX(of_aliases_mutex); 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"); of_chosen = of_find_node_by_path("/chosen");
if (of_chosen == NULL) if (of_chosen == NULL)
of_chosen = of_find_node_by_path("/chosen@0"); 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"); of_aliases = of_find_node_by_path("/aliases");
if (!of_aliases) if (!of_aliases)
return; return;
@ -1703,3 +1713,19 @@ const char *of_prop_next_string(struct property *prop, const char *cur)
return curv; return curv;
} }
EXPORT_SYMBOL_GPL(of_prop_next_string); 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);

7
include/linux/of.h
View file

@ -343,6 +343,8 @@ const char *of_prop_next_string(struct property *prop, const char *cur);
s; \ s; \
s = of_prop_next_string(prop, s)) s = of_prop_next_string(prop, s))
int of_device_is_stdout_path(struct device_node *dn);
#else /* CONFIG_OF */ #else /* CONFIG_OF */
static inline const char* of_node_full_name(struct device_node *np) 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; 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_ptr(_ptr) NULL
#define of_match_node(_matches, _node) NULL #define of_match_node(_matches, _node) NULL
#define of_property_for_each_u32(np, propname, prop, p, u) \ #define of_property_for_each_u32(np, propname, prop, p, u) \