diff options
author | Michal Simek <monstr@monstr.eu> | 2011-04-06 07:06:45 -0400 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2011-07-25 03:25:26 -0400 |
commit | ca12adc8ca6814d1949fcc6d83c1adda6dc9e2ef (patch) | |
tree | 4e9c522e867ded37b9e51043fcc4c89b27227b2f /arch/microblaze | |
parent | 2aa8e37596933a43fc3e46e1e385045635674429 (diff) |
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/microblaze')
-rw-r--r-- | arch/microblaze/kernel/early_printk.c | 2 | ||||
-rw-r--r-- | 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) | |||
35 | * we'll never timeout on a working UART. | 35 | * we'll never timeout on a working UART. |
36 | */ | 36 | */ |
37 | 37 | ||
38 | unsigned retries = 10000; | 38 | unsigned retries = 1000000; |
39 | /* read status bit - 0x8 offset */ | 39 | /* read status bit - 0x8 offset */ |
40 | while (--retries && (in_be32(base_addr + 8) & (1 << 3))) | 40 | while (--retries && (in_be32(base_addr + 8) & (1 << 3))) |
41 | ; | 41 | ; |
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, | |||
88 | } | 88 | } |
89 | if ((strncmp(p, "xlnx,xps-uartlite", 17) == 0) || | 89 | if ((strncmp(p, "xlnx,xps-uartlite", 17) == 0) || |
90 | (strncmp(p, "xlnx,opb-uartlite", 17) == 0) || | 90 | (strncmp(p, "xlnx,opb-uartlite", 17) == 0) || |
91 | (strncmp(p, "xlnx,axi-uartlite", 17) == 0)) { | 91 | (strncmp(p, "xlnx,axi-uartlite", 17) == 0) || |
92 | (strncmp(p, "xlnx,mdm", 8) == 0)) { | ||
92 | unsigned int *addrp; | 93 | unsigned int *addrp; |
93 | 94 | ||
94 | *(u32 *)data = UARTLITE; | 95 | *(u32 *)data = UARTLITE; |