[parisc-linux-cvs] [PATCH] Fix lasi boot problem on the E35.

Ryan Bradetich rbradetich@uswest.net
11 Sep 2002 00:52:01 -0600


This patch fixes a problem where we tried to disable the lasi audio
interrupts on a system where the lasi audio driver did not exist.

- Ryan

Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.346
diff -u -p -r1.346 Makefile
--- Makefile	11 Sep 2002 05:48:55 -0000	1.346
+++ Makefile	11 Sep 2002 06:47:55 -0000
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 19
-EXTRAVERSION = -pa11
+EXTRAVERSION = -pa12
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: drivers/gsc/lasi.c
===================================================================
RCS file: /var/cvs/linux/drivers/gsc/lasi.c,v
retrieving revision 1.37
diff -u -p -r1.37 lasi.c
--- drivers/gsc/lasi.c	26 Mar 2002 05:18:37 -0000	1.37
+++ drivers/gsc/lasi.c	11 Sep 2002 06:47:56 -0000
@@ -26,7 +26,7 @@
 #include <asm/gsc.h>
 #include <asm/hardware.h>
 #include <asm/led.h>
-
+#include <asm/pdc.h>
 #include "busdevice.h"
 

@@ -77,7 +77,10 @@ lasi_init_irq(struct busdevice *this_las
 
 	/* Resets */
 	/* gsc_writel(0xFFFFFFFF, lasi_base+0x2000);*/	/* Parallel */
-	gsc_writel(0xFFFFFFFF, lasi_base+0x4004);	/* Audio */
+
+	if(pdc_add_valid(lasi_base+0x4004) == PDC_OK)
+		gsc_writel(0xFFFFFFFF, lasi_base+0x4004);	/* Audio */
+
 	/* gsc_writel(0xFFFFFFFF, lasi_base+0x5000);*/	/* Serial */ 
 	/* gsc_writel(0xFFFFFFFF, lasi_base+0x6000);*/	/* SCSI */
 	gsc_writel(0xFFFFFFFF, lasi_base+0x7000);	/* LAN */