| Message ID | 1352971866-540-2-git-send-email-s.hauer@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10:31 Thu 15 Nov , 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. I like it but I've an issue with it I cannot specify the option for as example I need to set the uart at 38400n8 or 115200n8 regarless of wath the booloader did Best Regards, J. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > drivers/of/base.c | 28 ++++++++++++++++++++++++++++ > include/linux/of.h | 7 +++++++ > 2 files changed, 35 insertions(+) > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index af3b22a..737feb8 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -1358,3 +1358,31 @@ 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) > +{ > + const char *name; > + struct device_node *dn_stdout; > + int is_stdout = 0; > + > + name = of_get_property(of_chosen, "linux,stdout-path", NULL); > + if (name == NULL) > + return 0; > + > + dn_stdout = of_find_node_by_path(name); > + > + if (dn_stdout && dn_stdout == dn) > + is_stdout = 1; > + > + of_node_put(dn_stdout); > + > + return is_stdout; > +} > +EXPORT_SYMBOL_GPL(of_device_is_stdout_path); > diff --git a/include/linux/of.h b/include/linux/of.h > index b4e50d5..5f857b5 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -310,6 +310,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) > @@ -437,6 +439,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) \ > -- > 1.7.10.4 > > _______________________________________________ > devicetree-discuss mailing list > devicetree-discuss@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss
On Mon, 19 Nov 2012 10:52:02 +0100, Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> wrote: > On 10:31 Thu 15 Nov , 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. > > I like it but I've an issue with it I cannot specify the option for > > as example I need to set the uart at 38400n8 or 115200n8 regarless of wath the > booloader did Right. stdout-path can have a set of arguments appended for things like serial speed. ePAPR says this about stdout-path: A string that specifies the full path to the node representing the device to be used for boot console output. If the character ":" is present in the value it terminates the path. The value may be an alias. If the stdin-path property is not specified, stdout-path should be assumed to define the input device. So, this function needs to do three more things: - also look for 'stdout-path' (in addition to 'linux,stdout-path') - Parse for a ':' in the path and trim that off so it can be used for arguments. (Bonus: return the arguments to the caller) - make sure that it can handle the path containing an alias (I've just not checked if the current code will handle this) g.
diff --git a/drivers/of/base.c b/drivers/of/base.c index af3b22a..737feb8 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1358,3 +1358,31 @@ 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) +{ + const char *name; + struct device_node *dn_stdout; + int is_stdout = 0; + + name = of_get_property(of_chosen, "linux,stdout-path", NULL); + if (name == NULL) + return 0; + + dn_stdout = of_find_node_by_path(name); + + if (dn_stdout && dn_stdout == dn) + is_stdout = 1; + + of_node_put(dn_stdout); + + return is_stdout; +} +EXPORT_SYMBOL_GPL(of_device_is_stdout_path); diff --git a/include/linux/of.h b/include/linux/of.h index b4e50d5..5f857b5 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -310,6 +310,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) @@ -437,6 +439,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) \
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> --- drivers/of/base.c | 28 ++++++++++++++++++++++++++++ include/linux/of.h | 7 +++++++ 2 files changed, 35 insertions(+)