git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
mach-at91rm9200
/
gpio.c
diff --git
a/arch/arm/mach-at91rm9200/gpio.c
b/arch/arm/mach-at91rm9200/gpio.c
index
5ab4627
..
0e396fe
100644
(file)
--- a/
arch/arm/mach-at91rm9200/gpio.c
+++ b/
arch/arm/mach-at91rm9200/gpio.c
@@
-261,7
+261,7
@@
static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs
void __iomem *pio;
u32 isr;
void __iomem *pio;
u32 isr;
- pio =
desc->base
;
+ pio =
(void __force __iomem *) desc->chipdata
;
/* temporarily mask (level sensitive) parent IRQ */
desc->chip->ack(irq);
/* temporarily mask (level sensitive) parent IRQ */
desc->chip->ack(irq);
@@
-312,7
+312,7
@@
void __init at91_gpio_irq_setup(unsigned banks)
__raw_writel(~0, controller + PIO_IDR);
set_irq_data(id, (void *) pin);
__raw_writel(~0, controller + PIO_IDR);
set_irq_data(id, (void *) pin);
- set_irq_chipdata(id, controller);
+ set_irq_chipdata(id,
(void __force *)
controller);
for (i = 0; i < 32; i++, pin++) {
set_irq_chip(pin, &gpio_irqchip);
for (i = 0; i < 32; i++, pin++) {
set_irq_chip(pin, &gpio_irqchip);