[POWERPC] Merge dtc upstream source

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / serial.c

diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index 944f0ee5bc0f14c341779ca926156bfbd850f0a1..cafeece20ac7c2675e3945457e26eb86e2269a10 100644 (file)
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -121,6 +121,15 @@ 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);
+       else if (dt_is_compatible(devp, "mpc5200-psc-uart"))
+               rc = mpc5200_psc_console_init(devp, &serial_cd);
+       else if (dt_is_compatible(devp, "xilinx,uartlite"))
+               rc = uartlite_console_init(devp, &serial_cd);
 
        /* Add other serial console driver calls here */