Update of /cvsroot/linux-mips/linux/arch/mips/korva
In directory usw-pr-cvs1:/tmp/cvs-serv23916/arch/mips/korva
Modified Files:
setup.c irq_korva.c
Log Message:
Remove bogus workaround.
Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/korva/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c 2001/09/17 17:02:29 1.2
+++ setup.c 2001/10/10 23:50:48 1.3
@@ -28,7 +28,7 @@
#include <asm/korva.h>
#include <asm/ddb5xxx/debug.h>
-#define USE_CPU_TIMER 1 /* are we using cpu counter as timer */
+// #define USE_CPU_TIMER 1 /* are we using cpu counter as timer */
extern void nec_korva_restart(char* c);
extern void nec_korva_halt(void);
@@ -43,7 +43,6 @@
s.line = 0; /* we set the first one */
s.baud_base = 1152000;
- // s.irq = 6;
s.irq = 10;
s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
s.iomem_base = (u8*)(KORVA_BASE_VIRT + KORVA_UARTDLL);
Index: irq_korva.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/korva/irq_korva.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- irq_korva.c 2001/09/17 17:02:29 1.2
+++ irq_korva.c 2001/10/10 23:50:48 1.3
@@ -22,8 +22,6 @@
#include <asm/korva.h>
#include <asm/mipsregs.h>
-#define KORVA_IRQ_WORKAROUND 1
-
/* [jsun] sooner or later we should move this debug stuff to MIPS common */
#include <asm/ddb5xxx/debug.h>
@@ -38,14 +36,8 @@
MIPS_ASSERT(irq >= korva_irq_base);
MIPS_ASSERT(irq < korva_irq_base+NUM_KORVA_IRQS);
-#if defined(KORVA_IRQ_WORKAROUND)
- clear_cp0_cause( 1 << (6 + 8));
- set_cp0_status(1 << (6 + 8));
-#else
irq -= korva_irq_base;
korva_out32(KORVA_S_IMR, korva_in32(KORVA_S_IMR) | (1 << irq) );
-#endif
-
}
static void
@@ -55,12 +47,8 @@
MIPS_ASSERT(irq >= korva_irq_base);
MIPS_ASSERT(irq < korva_irq_base+NUM_KORVA_IRQS);
-#if defined(KORVA_IRQ_WORKAROUND)
- clear_cp0_status(1 << (6 + 8));
-#else
irq -= korva_irq_base;
korva_out32(KORVA_S_IMR, korva_in32(KORVA_S_IMR) & ~(1 << irq) );
-#endif
}
static unsigned int korva_irq_startup(unsigned int irq)
@@ -102,8 +90,4 @@
}
korva_irq_base = irq_base;
-
-#if defined(KORVA_IRQ_WORKAROUND)
- korva_out32(KORVA_S_IMR, 0xff);
-#endif
}
|
