Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
  [POWERPC] Add memchr() to the bootwrapper
  [POWERPC] Implement logging of unhandled signals
  [POWERPC] Add legacy serial support for OPB with flattened device tree
  [POWERPC] Use 1TB segments
  [POWERPC] XilinxFB: Allow fixed framebuffer base address
  [POWERPC] XilinxFB: Add support for custom screen resolution
  [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
  [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
  [POWERPC] 4xx: Kilauea defconfig file
  [POWERPC] 4xx: Kilauea DTS
  [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
  [POWERPC] 4xx: Add AMCC 405EX support to cputable.c
  [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
  [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
  [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
  [POWERPC] 85xx: Killed <asm/mpc85xx.h>
  [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
  [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
  [POWERPC] mpc8272ads: Remove muram from the CPM reg property.
  [POWERPC] Make clockevents work on PPC601 processors
  ...

Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.

1 files changed, 14 insertions, 9 deletions

diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index eaa0d3ae3518..cafeece20ac7 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -19,8 +19,6 @@
 #include "io.h"
 #include "ops.h"
 
-extern void udelay(long delay);
-
 static int serial_open(void)
 {
         struct serial_console_data *scdp = console_ops.data;
@@ -114,29 +112,36 @@ int serial_console_init(void)
 {
         void *devp;
         int rc = -1;
-        char compat[MAX_PROP_LEN];
 
         devp = serial_get_stdout_devp();
         if (devp == NULL)
                 goto err_out;
 
-        if (getprop(devp, "compatible", compat, sizeof(compat)) < 0)
-                goto err_out;
-
-        if (!strcmp(compat, "ns16550"))
+        if (dt_is_compatible(devp, "ns16550"))
                 rc = ns16550_console_init(devp, &serial_cd);
-        else if (!strcmp(compat, "marvell,mpsc"))
+        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 */
 
         if (!rc) {
                 console_ops.open = serial_open;
                 console_ops.write = serial_write;
-                console_ops.edit_cmdline = serial_edit_cmdline;
                 console_ops.close = serial_close;
                 console_ops.data = &serial_cd;
 
+                if (serial_cd.getc)
+                        console_ops.edit_cmdline = serial_edit_cmdline;
+
                 return 0;
         }
 err_out: