summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2011-04-06 13:06:45 +0200
committerMichal Simek <monstr@monstr.eu>2011-07-25 09:25:26 +0200
commitca12adc8ca6814d1949fcc6d83c1adda6dc9e2ef (patch)
tree4e9c522e867ded37b9e51043fcc4c89b27227b2f /arch
parent2aa8e37596933a43fc3e46e1e385045635674429 (diff)
downloadlinux-ca12adc8ca6814d1949fcc6d83c1adda6dc9e2ef.tar.gz
linux-ca12adc8ca6814d1949fcc6d83c1adda6dc9e2ef.tar.bz2
linux-ca12adc8ca6814d1949fcc6d83c1adda6dc9e2ef.zip
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 <monstr@monstr.eu>
Diffstat (limited to 'arch')
-rw-r--r--arch/microblaze/kernel/early_printk.c2
-rw-r--r--arch/microblaze/kernel/prom.c3
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;