summaryrefslogtreecommitdiff
path: root/arch/microblaze/include
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2011-04-14 11:48:43 +0200
committerMichal Simek <monstr@monstr.eu>2011-07-25 09:25:13 +0200
commit2aa8e37596933a43fc3e46e1e385045635674429 (patch)
tree79cbf1212d42d583a5a5951e28d90e27e94df4e4 /arch/microblaze/include
parente721a45fbed13a52093d2cc1962dbb8a754462ea (diff)
downloadlinux-3.10-2aa8e37596933a43fc3e46e1e385045635674429.tar.gz
linux-3.10-2aa8e37596933a43fc3e46e1e385045635674429.tar.bz2
linux-3.10-2aa8e37596933a43fc3e46e1e385045635674429.zip
microblaze: Simplify early console binding from DT
Recognize early Linux console from chosen - linux,stdout-path instead of detecting the first console with appropriate compatible strings. This patch solved the problem on system with multiple consoles. Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/include')
-rw-r--r--arch/microblaze/include/asm/prom.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index d0890d36ef6..34c4e8b2780 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -26,8 +26,12 @@
#define HAVE_ARCH_DEVTREE_FIXUPS
/* Other Prototypes */
-extern int early_uartlite_console(void);
-extern int early_uart16550_console(void);
+enum early_consoles {
+ UARTLITE = 1,
+ UART16550 = 2,
+};
+
+extern int of_early_console(void *version);
#ifdef CONFIG_PCI
/*