aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2006-08-16 23:12:14 -0500
committerPaul Mackerras <paulus@samba.org>2006-08-25 13:27:35 +1000
commit9a2ded55c40ad17b8b12f87c592a40b2e8593c4d (patch)
treef1fd41f15356787e68915257be26dafb0d951932 /arch/powerpc/kernel
parent[POWERPC] Allow MPC8641 HPCN to build with CONFIG_PCI disabled too. (diff)
downloadlinux-dev-9a2ded55c40ad17b8b12f87c592a40b2e8593c4d.tar.xz
linux-dev-9a2ded55c40ad17b8b12f87c592a40b2e8593c4d.zip
[POWERPC] powerpc: Make RTAS console init generic
The rtas console doesn't have to be Cell specific. If we get both RTAS tokens, we should just enabled the console then and there. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/rtas.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index bfd66d3a035c..6b0699b82b41 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -910,6 +910,11 @@ int __init early_init_dt_scan_rtas(unsigned long node,
basep = of_get_flat_dt_prop(node, "get-term-char", NULL);
if (basep)
rtas_getchar_token = *basep;
+
+ if (rtas_putchar_token != RTAS_UNKNOWN_SERVICE &&
+ rtas_getchar_token != RTAS_UNKNOWN_SERVICE)
+ udbg_init_rtas_console();
+
#endif
/* break now */