From ca12adc8ca6814d1949fcc6d83c1adda6dc9e2ef Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 6 Apr 2011 13:06:45 +0200 Subject: [PATCH] microblaze: Add support for early console on mdm Support mdm early console: - extend time for retries - add mdm compatible property Signed-off-by: Michal Simek --- arch/microblaze/kernel/early_printk.c | 2 +- arch/microblaze/kernel/prom.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/microblaze/kernel/early_printk.c b/arch/microblaze/kernel/early_printk.c index e21390da0a4d..d26d92d47754 100644 --- a/arch/microblaze/kernel/early_printk.c +++ b/arch/microblaze/kernel/early_printk.c @@ -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))) ; diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 18d9371d9b26..977484add216 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c @@ -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; -- 2.20.1