Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[karo-tx-linux.git] / arch / powerpc / boot / serial.c

diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index d47f8e0b4b8195e0564b888ae551ef90b692bdc3..cafeece20ac7c2675e3945457e26eb86e2269a10 100644 (file)
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -126,6 +126,10 @@ int serial_console_init(void)
                 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 */