Skip to content

Commit

Permalink
[POWERPC] Call add_preferred_console when MPSC is console
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark A. Greer authored and Paul Mackerras committed Jun 25, 2007
1 parent e3855fa commit 542c98c
Showing 1 changed file with 28 additions and 0 deletions.
28 changes: 28 additions & 0 deletions arch/powerpc/sysdev/mv64x60_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -420,3 +421,30 @@ static int __init mv64x60_device_setup(void)
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);

0 comments on commit 542c98c

Please sign in to comment.