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 'master' into for-next
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
3ds_debugboard.c
diff --git
a/arch/arm/plat-mxc/3ds_debugboard.c
b/arch/arm/plat-mxc/3ds_debugboard.c
index
639c54a
..
c856fa3
100644
(file)
--- a/
arch/arm/plat-mxc/3ds_debugboard.c
+++ b/
arch/arm/plat-mxc/3ds_debugboard.c
@@
-60,7
+60,6
@@
#define EXPIO_INT_BUTTON_B (MXC_BOARD_IRQ_START + 4)
static void __iomem *brd_io;
#define EXPIO_INT_BUTTON_B (MXC_BOARD_IRQ_START + 4)
static void __iomem *brd_io;
-static void expio_ack_irq(u32 irq);
static struct resource smsc911x_resources[] = {
{
static struct resource smsc911x_resources[] = {
{
@@
-93,7
+92,8
@@
static void mxc_expio_irq_handler(u32 irq, struct irq_desc *desc)
u32 int_valid;
u32 expio_irq;
u32 int_valid;
u32 expio_irq;
- desc->chip->mask(irq); /* irq = gpio irq number */
+ /* irq = gpio irq number */
+ desc->irq_data.chip->irq_mask(&desc->irq_data);
imr_val = __raw_readw(brd_io + INTR_MASK_REG);
int_valid = __raw_readw(brd_io + INTR_STATUS_REG) & ~imr_val;
imr_val = __raw_readw(brd_io + INTR_MASK_REG);
int_valid = __raw_readw(brd_io + INTR_STATUS_REG) & ~imr_val;
@@
-110,37
+110,37
@@
static void mxc_expio_irq_handler(u32 irq, struct irq_desc *desc)
d->handle_irq(expio_irq, d);
}
d->handle_irq(expio_irq, d);
}
- desc->
chip->ack(irq
);
- desc->
chip->unmask(irq
);
+ desc->
irq_data.chip->irq_ack(&desc->irq_data
);
+ desc->
irq_data.chip->irq_unmask(&desc->irq_data
);
}
/*
* Disable an expio pin's interrupt by setting the bit in the imr.
* Irq is an expio virtual irq number
*/
}
/*
* Disable an expio pin's interrupt by setting the bit in the imr.
* Irq is an expio virtual irq number
*/
-static void expio_mask_irq(
u32 irq
)
+static void expio_mask_irq(
struct irq_data *d
)
{
u16 reg;
{
u16 reg;
- u32 expio = MXC_IRQ_TO_EXPIO(irq);
+ u32 expio = MXC_IRQ_TO_EXPIO(
d->
irq);
reg = __raw_readw(brd_io + INTR_MASK_REG);
reg |= (1 << expio);
__raw_writew(reg, brd_io + INTR_MASK_REG);
}
reg = __raw_readw(brd_io + INTR_MASK_REG);
reg |= (1 << expio);
__raw_writew(reg, brd_io + INTR_MASK_REG);
}
-static void expio_ack_irq(
u32 irq
)
+static void expio_ack_irq(
struct irq_data *d
)
{
{
- u32 expio = MXC_IRQ_TO_EXPIO(irq);
+ u32 expio = MXC_IRQ_TO_EXPIO(
d->
irq);
__raw_writew(1 << expio, brd_io + INTR_RESET_REG);
__raw_writew(0, brd_io + INTR_RESET_REG);
__raw_writew(1 << expio, brd_io + INTR_RESET_REG);
__raw_writew(0, brd_io + INTR_RESET_REG);
- expio_mask_irq(
irq
);
+ expio_mask_irq(
d
);
}
}
-static void expio_unmask_irq(
u32 irq
)
+static void expio_unmask_irq(
struct irq_data *d
)
{
u16 reg;
{
u16 reg;
- u32 expio = MXC_IRQ_TO_EXPIO(irq);
+ u32 expio = MXC_IRQ_TO_EXPIO(
d->
irq);
reg = __raw_readw(brd_io + INTR_MASK_REG);
reg &= ~(1 << expio);
reg = __raw_readw(brd_io + INTR_MASK_REG);
reg &= ~(1 << expio);
@@
-148,9
+148,9
@@
static void expio_unmask_irq(u32 irq)
}
static struct irq_chip expio_irq_chip = {
}
static struct irq_chip expio_irq_chip = {
- .ack = expio_ack_irq,
- .mask = expio_mask_irq,
- .unmask = expio_unmask_irq,
+ .
irq_
ack = expio_ack_irq,
+ .
irq_
mask = expio_mask_irq,
+ .
irq_
unmask = expio_unmask_irq,
};
int __init mxc_expio_init(u32 base, u32 p_irq)
};
int __init mxc_expio_init(u32 base, u32 p_irq)