[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_vxt.c,1.16,1.17

[Jan-Benedict G. <jb...@us...>]

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

Modified Files:
	cpu_vxt.c 
Log Message:
- With two hacks (commented out NICR setting and not disabling early
  console upon request) this boots to the point where it tries to get
  NFS-Root access. However, the network driver isn't done yet, so no
  network, no root, panic.


Index: cpu_vxt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_vxt.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cpu_vxt.c	2 Oct 2004 18:45:54 -0000	1.16
+++ cpu_vxt.c	3 Oct 2004 11:32:30 -0000	1.17
@@ -13,6 +13,7 @@
 
 #include <linux/types.h>	/* For NULL */
 #include <linux/kernel.h>	/* For printk */
+#include <linux/device.h>
 #include <asm/mtpr.h>
 #include <asm/mv.h>
 #include <asm/vaxcpu.h>
@@ -30,7 +31,10 @@
 
 static const char *vxt_cpu_type_str(void)
 {
-	return "VXT2000";
+	if (mv->sidex == 0x08050002 /* FIXME */)
+		return "VXT2000+";
+	else
+		return "probably VXT2000";
 }
 
 struct vax_mv mv_vxt = {
@@ -55,3 +59,18 @@
         .sidex_match = SOC_SIDEX_TYPE_VXT << SOC_SIDEX_TYPE_SHIFT
 };
 
+static struct platform_device vxt_diag_led_device = {
+	.name = "diag_led"
+};
+
+static int __init vxt_platform_device_init (void)
+{
+	if (!is_vxt ())
+		return -ENODEV;
+
+	platform_device_register (&vxt_diag_led_device);
+
+	return 0;
+}
+arch_initcall (vxt_platform_device_init);
+