diff options
| -rw-r--r-- | common/console.c | 20 | ||||
| -rw-r--r-- | drivers/of/base.c | 19 | ||||
| -rw-r--r-- | drivers/of/platform.c | 2 | ||||
| -rw-r--r-- | include/of.h | 8 |
4 files changed, 29 insertions, 20 deletions
diff --git a/common/console.c b/common/console.c index 8a0af75a1f..ad1a6aaab2 100644 --- a/common/console.c +++ b/common/console.c @@ -220,7 +220,7 @@ static void console_init_early(void) initialized = CONSOLE_INITIALIZED_BUFFER; } -static void console_set_stdoutpath(struct console_device *cdev) +static void console_set_stdoutpath(struct console_device *cdev, unsigned baudrate) { int id; char *str; @@ -232,8 +232,7 @@ static void console_set_stdoutpath(struct console_device *cdev) if (id < 0) return; - str = basprintf("console=%s%d,%dn8", cdev->linux_console_name, id, - cdev->baudrate); + str = basprintf("console=%s%d,%dn8", cdev->linux_console_name, id, baudrate); globalvar_add_simple("linux.bootargs.console", str); @@ -297,6 +296,7 @@ int console_register(struct console_device *newcdev) struct device_node *serdev_node = console_is_serdev_node(newcdev); struct device_d *dev = &newcdev->class_dev; int activate = 0, ret; + unsigned baudrate = CONFIG_BAUDRATE; if (!serdev_node && initialized == CONSOLE_UNINITIALIZED) console_init_early(); @@ -327,11 +327,16 @@ int console_register(struct console_device *newcdev) if (serdev_node) return of_platform_populate(serdev_node, NULL, dev); + if (newcdev->dev && of_device_is_stdout_path(newcdev->dev, &baudrate)) { + activate = 1; + console_set_stdoutpath(newcdev, baudrate); + } + if (newcdev->setbrg) { - ret = newcdev->setbrg(newcdev, CONFIG_BAUDRATE); + ret = newcdev->setbrg(newcdev, baudrate); if (ret) return ret; - newcdev->baudrate_param = newcdev->baudrate = CONFIG_BAUDRATE; + newcdev->baudrate_param = newcdev->baudrate = baudrate; dev_add_param_uint32(dev, "baudrate", console_baudrate_set, NULL, &newcdev->baudrate_param, "%u", newcdev); } @@ -349,11 +354,6 @@ int console_register(struct console_device *newcdev) activate = 1; } - if (newcdev->dev && of_device_is_stdout_path(newcdev->dev)) { - activate = 1; - console_set_stdoutpath(newcdev); - } - list_add_tail(&newcdev->list, &console_list); if (activate) diff --git a/drivers/of/base.c b/drivers/of/base.c index 77970bfbe9..5c39d4bcef 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -2461,7 +2461,7 @@ void of_delete_node(struct device_node *node) free(node); } -struct device_node *of_get_stdoutpath(void) +struct device_node *of_get_stdoutpath(unsigned int *baudrate) { struct device_node *dn; const char *name; @@ -2483,15 +2483,24 @@ struct device_node *of_get_stdoutpath(void) free(q); + if (baudrate && *p) { + unsigned rate = simple_strtoul(p + 1, NULL, 10); + if (rate) + *baudrate = rate; + } + return dn; } -int of_device_is_stdout_path(struct device_d *dev) +int of_device_is_stdout_path(struct device_d *dev, unsigned int *baudrate) { - if (!dev->device_node) - return 0; + unsigned int tmp = *baudrate; + + if (!dev || !dev->device_node || dev->device_node != of_get_stdoutpath(&tmp)) + return false; - return dev->device_node == of_get_stdoutpath(); + *baudrate = tmp; + return true; } /** diff --git a/drivers/of/platform.c b/drivers/of/platform.c index e3e8227b8c..92b6caef5a 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -532,7 +532,7 @@ static int of_stdoutpath_init(void) { struct device_node *np; - np = of_get_stdoutpath(); + np = of_get_stdoutpath(NULL); if (!np) return 0; diff --git a/include/of.h b/include/of.h index 6f1ec94e7e..880e380359 100644 --- a/include/of.h +++ b/include/of.h @@ -287,8 +287,8 @@ struct cdev *of_parse_partition(struct cdev *cdev, struct device_node *node); int of_parse_partitions(struct cdev *cdev, struct device_node *node); int of_fixup_partitions(struct device_node *np, struct cdev *cdev); int of_partitions_register_fixup(struct cdev *cdev); -struct device_node *of_get_stdoutpath(void); -int of_device_is_stdout_path(struct device_d *dev); +struct device_node *of_get_stdoutpath(unsigned int *); +int of_device_is_stdout_path(struct device_d *dev, unsigned int *baudrate); const char *of_get_model(void); void *of_flatten_dtb(struct device_node *node); int of_add_memory(struct device_node *node, bool dump); @@ -325,12 +325,12 @@ static inline int of_partitions_register_fixup(struct cdev *cdev) return -ENOSYS; } -static inline struct device_node *of_get_stdoutpath(void) +static inline struct device_node *of_get_stdoutpath(unsigned int *rate) { return NULL; } -static inline int of_device_is_stdout_path(struct device_d *dev) +static inline int of_device_is_stdout_path(struct device_d *dev, unsigned int *baudrate) { return 0; } |