git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull acpi_bus_register_driver into release branch
[pandora-kernel.git]
/
arch
/
mips
/
lasat
/
interrupt.c
diff --git
a/arch/mips/lasat/interrupt.c
b/arch/mips/lasat/interrupt.c
index
c90da16
..
2d3472b
100644
(file)
--- a/
arch/mips/lasat/interrupt.c
+++ b/
arch/mips/lasat/interrupt.c
@@
-27,14
+27,13
@@
#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <asm/lasat/lasatint.h>
#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <asm/lasat/lasatint.h>
+#include <asm/time.h>
#include <asm/gdb-stub.h>
static volatile int *lasat_int_status = NULL;
static volatile int *lasat_int_mask = NULL;
static volatile int lasat_int_mask_shift;
#include <asm/gdb-stub.h>
static volatile int *lasat_int_status = NULL;
static volatile int *lasat_int_mask = NULL;
static volatile int lasat_int_mask_shift;
-extern asmlinkage void lasatIRQ(void);
-
void disable_lasat_irq(unsigned int irq_nr)
{
unsigned long flags;
void disable_lasat_irq(unsigned int irq_nr)
{
unsigned long flags;
@@
-71,14
+70,13
@@
static void end_lasat_irq(unsigned int irq)
}
static struct hw_interrupt_type lasat_irq_type = {
}
static struct hw_interrupt_type lasat_irq_type = {
- "Lasat",
- startup_lasat_irq,
- shutdown_lasat_irq,
- enable_lasat_irq,
- disable_lasat_irq,
- mask_and_ack_lasat_irq,
- end_lasat_irq,
- NULL
+ .typename = "Lasat",
+ .startup = startup_lasat_irq,
+ .shutdown = shutdown_lasat_irq,
+ .enable = enable_lasat_irq,
+ .disable = disable_lasat_irq,
+ .ack = mask_and_ack_lasat_irq,
+ .end = end_lasat_irq,
};
static inline int ls1bit32(unsigned int x)
};
static inline int ls1bit32(unsigned int x)
@@
-110,11
+108,17
@@
static unsigned long get_int_status_200(void)
return int_status;
}
return int_status;
}
-
void lasat_hw0_irq
dispatch(struct pt_regs *regs)
+
asmlinkage void plat_irq_
dispatch(struct pt_regs *regs)
{
unsigned long int_status;
{
unsigned long int_status;
+ unsigned int cause = read_c0_cause();
int irq;
int irq;
+ if (cause & CAUSEF_IP7) { /* R4000 count / compare IRQ */
+ ll_timer_interrupt(7, regs);
+ return;
+ }
+
int_status = get_int_status();
/* if int_status == 0, then the interrupt has already been cleared */
int_status = get_int_status();
/* if int_status == 0, then the interrupt has already been cleared */
@@
-148,9
+152,6
@@
void __init arch_init_irq(void)
panic("arch_init_irq: mips_machtype incorrect");
}
panic("arch_init_irq: mips_machtype incorrect");
}
- /* Now safe to set the exception vector. */
- set_except_vector(0, lasatIRQ);
-
for (i = 0; i <= LASATINT_END; i++) {
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = 0;
for (i = 0; i <= LASATINT_END; i++) {
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = 0;