diff options
| author | Mark A. Greer <mgreer@mvista.com> | 2007-06-07 02:38:00 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-06-25 09:02:09 +0200 |
| commit | 542c98c06712fdbbbfe6b9e92a8d0023cf45102a (patch) | |
| tree | f87ea85550270e0c8bb1dea1d32cabd0a061c1da | |
| parent | [POWERPC] Add for_each_compatible_node() (diff) | |
| download | linux-542c98c06712fdbbbfe6b9e92a8d0023cf45102a.tar.xz linux-542c98c06712fdbbbfe6b9e92a8d0023cf45102a.zip | |
[POWERPC] Call add_preferred_console when MPSC is console
When a Marvell MPSC (serial controller) port is the specified
/chosen/stdout-path device, call 'add_preferred_console()' so the user
doesn't have to specify a 'console=ttyMMx' cmdline argument.
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Acked-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/sysdev/mv64x60_dev.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c index 4b0a9c88eeb3..b618fa60aef3 100644 --- a/arch/powerpc/sysdev/mv64x60_dev.c +++ b/arch/powerpc/sysdev/mv64x60_dev.c @@ -12,6 +12,7 @@ #include <linux/stddef.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/console.h> #include <linux/mv643xx.h> #include <linux/platform_device.h> @@ -420,3 +421,30 @@ error: return err; } arch_initcall(mv64x60_device_setup); + +static int __init mv64x60_add_mpsc_console(void) +{ + struct device_node *np = NULL; + const char *prop; + + prop = of_get_property(of_chosen, "linux,stdout-path", NULL); + if (prop == NULL) + goto not_mpsc; + + np = of_find_node_by_path(prop); + if (!np) + goto not_mpsc; + + if (!of_device_is_compatible(np, "marvell,mpsc")) + goto not_mpsc; + + prop = of_get_property(np, "block-index", NULL); + if (!prop) + goto not_mpsc; + + add_preferred_console("ttyMM", *(int *)prop, NULL); + +not_mpsc: + return 0; +} +console_initcall(mv64x60_add_mpsc_console); |