summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/serial.c
diff options
context:
space:
mode:
authorMark A. Greer2007-05-12 02:54:31 +0200
committerPaul Mackerras2007-05-12 03:32:49 +0200
commite12deb840ceed7051ab4799ae71b675a83c58c7c (patch)
treee1adaeb62fda1fa2557c4083f8d51e16a0580a9a /arch/powerpc/boot/serial.c
parent[POWERPC] Add bootwrapper support for Marvell/mv64x60 hostbridge (diff)
downloadkernel-qcow2-linux-e12deb840ceed7051ab4799ae71b675a83c58c7c.tar.gz
kernel-qcow2-linux-e12deb840ceed7051ab4799ae71b675a83c58c7c.tar.xz
kernel-qcow2-linux-e12deb840ceed7051ab4799ae71b675a83c58c7c.zip
[POWERPC] Add bootwrapper support for Marvell MPSC
The bootwrapper requires a serial driver to allow cmdline editing and information reporting on the console. This driver is required by platforms that boot a zImage and use the MPSC for the console. Signed-off-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot/serial.c')
-rw-r--r--arch/powerpc/boot/serial.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index e8de4cf59be7..7fd32330a9a5 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -125,6 +125,8 @@ int serial_console_init(void)
if (!strcmp(compat, "ns16550"))
rc = ns16550_console_init(devp, &serial_cd);
+ else if (!strcmp(compat, "marvell,mpsc"))
+ rc = mpsc_console_init(devp, &serial_cd);
/* Add other serial console driver calls here */