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
Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
fpga.c
diff --git
a/arch/arm/mach-omap1/fpga.c
b/arch/arm/mach-omap1/fpga.c
index
efe9bfc
..
0cf62ef
100644
(file)
--- a/
arch/arm/mach-omap1/fpga.c
+++ b/
arch/arm/mach-omap1/fpga.c
@@
-32,7
+32,7
@@
static void fpga_mask_irq(unsigned int irq)
{
static void fpga_mask_irq(unsigned int irq)
{
- irq -= OMAP
1510_IH_FPGA
_BASE;
+ irq -= OMAP
_FPGA_IRQ
_BASE;
if (irq < 8)
__raw_writeb((__raw_readb(OMAP1510_FPGA_IMR_LO)
if (irq < 8)
__raw_writeb((__raw_readb(OMAP1510_FPGA_IMR_LO)
@@
-65,7
+65,7
@@
static void fpga_ack_irq(unsigned int irq)
static void fpga_unmask_irq(unsigned int irq)
{
static void fpga_unmask_irq(unsigned int irq)
{
- irq -= OMAP
1510_IH_FPGA
_BASE;
+ irq -= OMAP
_FPGA_IRQ
_BASE;
if (irq < 8)
__raw_writeb((__raw_readb(OMAP1510_FPGA_IMR_LO) | (1 << irq)),
if (irq < 8)
__raw_writeb((__raw_readb(OMAP1510_FPGA_IMR_LO) | (1 << irq)),
@@
-84,10
+84,9
@@
static void fpga_mask_ack_irq(unsigned int irq)
fpga_ack_irq(irq);
}
fpga_ack_irq(irq);
}
-void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc,
- struct pt_regs *regs)
+void innovator_fpga_IRQ_demux(unsigned int irq, struct irq_desc *desc)
{
{
- struct irqdesc *d;
+ struct irq
_
desc *d;
u32 stat;
int fpga_irq;
u32 stat;
int fpga_irq;
@@
-96,12
+95,12
@@
void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc,
if (!stat)
return;
if (!stat)
return;
- for (fpga_irq = OMAP
1510_IH_FPGA
_BASE;
- (fpga_irq <
(OMAP1510_IH_FPGA_BASE + NR_FPGA_IRQS)
) && stat;
+ for (fpga_irq = OMAP
_FPGA_IRQ
_BASE;
+ (fpga_irq <
OMAP_FPGA_IRQ_END
) && stat;
fpga_irq++, stat >>= 1) {
if (stat & 1) {
d = irq_desc + fpga_irq;
fpga_irq++, stat >>= 1) {
if (stat & 1) {
d = irq_desc + fpga_irq;
- desc_handle_irq(fpga_irq, d
, regs
);
+ desc_handle_irq(fpga_irq, d);
}
}
}
}
}
}
@@
-152,7
+151,7
@@
void omap1510_fpga_init_irq(void)
__raw_writeb(0, OMAP1510_FPGA_IMR_HI);
__raw_writeb(0, INNOVATOR_FPGA_IMR2);
__raw_writeb(0, OMAP1510_FPGA_IMR_HI);
__raw_writeb(0, INNOVATOR_FPGA_IMR2);
- for (i = OMAP
1510_IH_FPGA_BASE; i < (OMAP1510_IH_FPGA_BASE + NR_FPGA_IRQS)
; i++) {
+ for (i = OMAP
_FPGA_IRQ_BASE; i < OMAP_FPGA_IRQ_END
; i++) {
if (i == OMAP1510_INT_FPGA_TS) {
/*
if (i == OMAP1510_INT_FPGA_TS) {
/*
@@
-169,7
+168,7
@@
void omap1510_fpga_init_irq(void)
set_irq_chip(i, &omap_fpga_irq);
}
set_irq_chip(i, &omap_fpga_irq);
}
- set_irq_handler(i,
do_edge_IRQ
);
+ set_irq_handler(i,
handle_edge_irq
);
set_irq_flags(i, IRQF_VALID);
}
set_irq_flags(i, IRQF_VALID);
}