Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29842
Modified Files:
cpu_ka42.c cpu_ka43.c cpu_ka46.c cpu_ka650.c
Log Message:
KA650 always as an IPR-based console port and KA42/43/46 always have
the diagnostic LEDs available. So create these platform devices at
init time as required
Index: cpu_ka650.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka650.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cpu_ka650.c 26 Apr 2004 23:30:41 -0000 1.11
+++ cpu_ka650.c 30 Jul 2004 00:21:27 -0000 1.12
@@ -85,15 +85,20 @@
.name = "cqbic"
};
+static struct platform_device ka650_iprcons_device = {
+ .name = "iprcons"
+};
+
static int __init ka650_platform_device_init(void)
{
- int retval = -ENODEV;
-
- if (mv == &mv_ka650) {
- retval = platform_device_register(&ka650_cqbic_device);
+ if (mv != &mv_ka650) {
+ return -ENODEV;
}
- return retval;
+ platform_device_register(&ka650_cqbic_device);
+ platform_device_register(&ka650_iprcons_device);
+
+ return 0;
}
arch_initcall(ka650_platform_device_init);
Index: cpu_ka46.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka46.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cpu_ka46.c 9 Jul 2004 19:16:14 -0000 1.13
+++ cpu_ka46.c 30 Jul 2004 00:21:27 -0000 1.14
@@ -145,6 +145,10 @@
.name = "ka4x-vsbus"
};
+static struct platform_device ka46_diag_led_device = {
+ .name = "diag_led"
+};
+
static int __init ka46_platform_device_init(void)
{
int retval;
@@ -153,9 +157,13 @@
return -ENODEV;
}
+ platform_device_register(&ka46_diag_led_device);
+
retval = platform_device_register(&ka46_vsbus_device);
if (!retval) {
+#ifdef CONFIG_VSBUS
vsbus_add_fixed_device(&ka46_vsbus_device.dev, "lance", 0x200e0000, 1);
+#endif
}
return retval;
Index: cpu_ka42.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka42.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cpu_ka42.c 10 May 2004 23:22:52 -0000 1.11
+++ cpu_ka42.c 30 Jul 2004 00:21:27 -0000 1.12
@@ -69,6 +69,10 @@
.name = "ka4x-vsbus"
};
+static struct platform_device ka42_diag_led_device = {
+ .name = "diag_led"
+};
+
static int __init ka42_platform_device_init(void)
{
int retval;
@@ -77,9 +81,13 @@
return -ENODEV;
}
+ platform_device_register(&ka42_diag_led_device);
+
retval = platform_device_register(&ka42_vsbus_device);
if (!retval) {
+#ifdef CONFIG_VSBUS
vsbus_add_fixed_device(&ka42_vsbus_device.dev, "lance", 0x200e0000, 5);
+#endif
}
return retval;
Index: cpu_ka43.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_ka43.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cpu_ka43.c 10 May 2004 23:38:07 -0000 1.14
+++ cpu_ka43.c 30 Jul 2004 00:21:27 -0000 1.15
@@ -249,6 +249,10 @@
.name = "ka4x-vsbus"
};
+static struct platform_device ka43_diag_led_device = {
+ .name = "diag_led"
+};
+
static int __init ka43_platform_device_init(void)
{
int retval;
@@ -257,9 +261,13 @@
return -ENODEV;
}
+ platform_device_register(&ka43_diag_led_device);
+
retval = platform_device_register(&ka43_vsbus_device);
if (!retval) {
+#ifdef CONFIG_VSBUS
vsbus_add_fixed_device(&ka43_vsbus_device.dev, "lance", 0x200e0000, 5);
+#endif
}
return retval;
|
