[LV-k25-commit] kernel-2.5/arch/vax/kernel clock.c,1.5,1.6 cpu_ka42.c,1.14,1.15 cpu_ka43.c,1.17,1.18 cpu_ka46.c,1.15,1.16

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

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7464/arch/vax/kernel

Modified Files:
	clock.c cpu_ka42.c cpu_ka43.c cpu_ka46.c 
Log Message:
Move all the current VSBUS code into drivers/vax/bus/vsbus.  I'm not
moving the irq auto-probe code since no working driver uses it at the
moment.  I'm very reluctant to resurrect the autoprobe code.  I'm
convinced that we can avoid autoprobing by find out where the interrupt
vector lookup tables are stored on all the newer machines.


Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cpu_ka46.c	6 Aug 2004 00:01:07 -0000	1.15
+++ cpu_ka46.c	18 Sep 2004 23:06:33 -0000	1.16
@@ -18,7 +18,6 @@
 #include <asm/mtpr.h>
 #include <asm/mv.h>
 #include <asm/vaxcpu.h>
-#include <asm/vsa.h>
 #include <asm/ka46.h>
 #include <asm/clock.h>   /* for clock_init routines */
 #include <asm/bus/vsbus.h>
@@ -121,9 +120,6 @@
 static void ka46_init_devices(void)
 {
 	printk("ka46: init_devices\n");
-#ifdef CONFIG_VSBUS
-	vsbus_setup();
-#endif /* CONFIG_VSBUS */
 	
 	/* Initialise the DMA area */
 	ka46_dma_init();

Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cpu_ka43.c	8 Aug 2004 23:47:03 -0000	1.17
+++ cpu_ka43.c	18 Sep 2004 23:06:33 -0000	1.18
@@ -23,7 +23,6 @@
 #include <asm/mtpr.h>
 #include <asm/mv.h>
 #include <asm/vaxcpu.h>
-#include <asm/vsa.h>
 #include <asm/tlbflush.h>
 #include <asm/ka43.h>
 #include <asm/clock.h>		/* For clock_init routines */
@@ -154,13 +153,6 @@
 	ka43_cache_reset();
 }
 
-static void ka43_init_devices(void)
-{
-#ifdef CONFIG_VSBUS
-	vsbus_setup();
-#endif /* CONFIG_VSBUS */
-}
-
 
 static const char *ka43_cpu_type_str(void)
 {
@@ -240,7 +232,6 @@
 	.post_vm_putchar = dz11_putchar,
 	.post_vm_getchar = dz11_getchar,
 	.mcheck = ka43_mcheck,
-	.init_devices = ka43_init_devices,
 	.cpu_type_str = ka43_cpu_type_str,
 	.clock_init = ka4x_clock_init,
 };

Index: clock.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/clock.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- clock.c	26 Feb 2004 06:26:24 -0000	1.5
+++ clock.c	18 Sep 2004 23:06:33 -0000	1.6
@@ -25,7 +25,7 @@
 #include <asm/mtpr.h>
 #include <asm/mv.h>
 #include <asm/clock.h>		/* for TODR, if anyone feels like implementing it */
-#include <asm/vsa.h>
+#include <asm/bus/vsbus.h>
 #include <linux/mc146818rtc.h>	/* includes asm/mc146818rtc.h */
 				/*  - needed for offsets in debug output */
 

Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cpu_ka42.c	8 Aug 2004 23:35:30 -0000	1.14
+++ cpu_ka42.c	18 Sep 2004 23:06:33 -0000	1.15
@@ -17,9 +17,7 @@
 #include <asm/mtpr.h>
 #include <asm/mv.h>
 #include <asm/vaxcpu.h>
-#include <asm/vsa.h>
 #include <asm/clock.h>		/* For clock_init routines */
-
 #include <asm/bus/vsbus.h>
  
 static void ka42_pre_vm_init(void)
@@ -41,13 +39,6 @@
 #endif
 }
 
-static void ka42_init_devices(void)
-{
-#ifdef CONFIG_VSBUS
-	vsbus_setup();
-#endif
-}
-
 static const char *ka42_cpu_type_str(void)
 {
    return "KA42";
@@ -60,7 +51,6 @@
 	.pre_vm_getchar = ka4x_prom_getchar, 
 	.post_vm_putchar = dz11_putchar,
 	.post_vm_getchar = dz11_getchar,
-	.init_devices = ka42_init_devices,
 	.cpu_type_str = ka42_cpu_type_str,
 	.clock_init = ka4x_clock_init,
 };