microblaze: Add support for early console on mdm
authorMichal Simek <monstr@monstr.eu>
Wed, 6 Apr 2011 11:06:45 +0000 (13:06 +0200)
committerMichal Simek <monstr@monstr.eu>
Mon, 25 Jul 2011 07:25:26 +0000 (09:25 +0200)
Support mdm early console:
 - extend time for retries
 - add mdm compatible property

Signed-off-by: Michal Simek <monstr@monstr.eu>
arch/microblaze/kernel/early_printk.c
arch/microblaze/kernel/prom.c

index e21390d..d26d92d 100644 (file)
@@ -35,7 +35,7 @@ static void early_printk_uartlite_putc(char c)
         * we'll never timeout on a working UART.
         */
 
-       unsigned retries = 10000;
+       unsigned retries = 1000000;
        /* read status bit - 0x8 offset */
        while (--retries && (in_be32(base_addr + 8) & (1 << 3)))
                ;
index 18d9371..977484a 100644 (file)
@@ -88,7 +88,8 @@ int __init early_init_dt_scan_chosen_serial(unsigned long node,
                }
                if ((strncmp(p, "xlnx,xps-uartlite", 17) == 0) ||
                                (strncmp(p, "xlnx,opb-uartlite", 17) == 0) ||
-                               (strncmp(p, "xlnx,axi-uartlite", 17) == 0)) {
+                               (strncmp(p, "xlnx,axi-uartlite", 17) == 0) ||
+                               (strncmp(p, "xlnx,mdm", 8) == 0)) {
                        unsigned int *addrp;
 
                        *(u32 *)data = UARTLITE;