summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/serial.c
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2007-08-20 19:39:57 +0200
committerPaul Mackerras <paulus@samba.org>2007-08-22 07:26:20 +0200
commitd0f53fafc016b3f4f20f63ecf52f6df8774bcb3c (patch)
treea02ad704dc8fce31942e3414f868b9d14132f16d /arch/powerpc/boot/serial.c
parent[POWERPC] bootwrapper: Declare udelay() in ops.h (diff)
downloadlinux-d0f53fafc016b3f4f20f63ecf52f6df8774bcb3c.tar.xz
linux-d0f53fafc016b3f4f20f63ecf52f6df8774bcb3c.zip
[POWERPC] bootwrapper: Add CPM serial driver
This serial port is used on all 8xx, many 82xx, and some 85xx chips. The driver requires that the port has already been set up by the firmware and/or platform code. Signed-off-by: Scott Wood <scottwood@freescale.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot/serial.c')
-rw-r--r--arch/powerpc/boot/serial.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index 944f0ee5bc0f..d47f8e0b4b81 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -121,6 +121,11 @@ int serial_console_init(void)
rc = ns16550_console_init(devp, &serial_cd);
else if (dt_is_compatible(devp, "marvell,mpsc"))
rc = mpsc_console_init(devp, &serial_cd);
+ else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
+ dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||
+ dt_is_compatible(devp, "fsl,cpm2-scc-uart") ||
+ dt_is_compatible(devp, "fsl,cpm2-smc-uart"))
+ rc = cpm_console_init(devp, &serial_cd);
/* Add other serial console driver calls here */