[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel cpu_ka650.c,1.5,1.6

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv29366/arch/vax/kernel

Modified Files:
	cpu_ka650.c 
Log Message:
Partially-working driver for console serial ports driven by RXCS, RXDB,
TXCS and TXDB internal processor registers.  printk() works, but it
doesn't yet work for regalar userland I/O.  Enabled by CONFIG_SERIAL_IPR
config option.  Only supported for KA650 right now.


Index: cpu_ka650.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka650.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cpu_ka650.c	20 May 2002 01:09:49 -0000	1.5
+++ cpu_ka650.c	29 Sep 2002 19:33:16 -0000	1.6
@@ -54,6 +54,8 @@
 
 unsigned int *ka650_cacr = (unsigned int *)0x20084000;
 
+extern void iprcons_serial_console_init(void);
+
 void ka650_pre_vm_init(void)
 {
    mv_ka650.sidex = *(unsigned int *)CVAX_SIDEX_ADDR;
@@ -95,7 +97,9 @@
    /* Writing to PR_CADR on the CVAX chip implicitly clears the level 1 cache */
    __mtpr(KA650_CADR_S2E|KA650_CADR_S1E|KA650_CADR_ISE|KA650_CADR_DSE, PR_CADR);
 
-   register_console(&vax_console);
+#if defined(CONFIG_SERIAL_IPR) && defined(CONFIG_SERIAL_CONSOLE)
+   iprcons_serial_console_init();
+#endif
 
    printk("KA650 sidex = %08x\n", mv_ka650.sidex);
 }