diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-11-29 05:18:26 -0500 |
---|---|---|
committer | Lennert Buytenhek <buytenh@wantstofly.org> | 2011-01-13 11:18:56 -0500 |
commit | a3f4c927d379cfaa597bc8ff75dc9d28f8d9200e (patch) | |
tree | 39521557543e91134b5a7e190bdf7b7ac2787e04 /arch/arm/mach-pxa/pxa27x.c | |
parent | 406b005045ad18ffa08c439545801e1c8cec4b5e (diff) |
ARM: PXA SoCs: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index b2130b7a7b52..987301ff4c33 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | #include <linux/sysdev.h> | 19 | #include <linux/sysdev.h> |
20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
21 | #include <linux/irq.h> | ||
21 | 22 | ||
22 | #include <asm/mach/map.h> | 23 | #include <asm/mach/map.h> |
23 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
@@ -343,18 +344,18 @@ static inline void pxa27x_init_pm(void) {} | |||
343 | /* PXA27x: Various gpios can issue wakeup events. This logic only | 344 | /* PXA27x: Various gpios can issue wakeup events. This logic only |
344 | * handles the simple cases, not the WEMUX2 and WEMUX3 options | 345 | * handles the simple cases, not the WEMUX2 and WEMUX3 options |
345 | */ | 346 | */ |
346 | static int pxa27x_set_wake(unsigned int irq, unsigned int on) | 347 | static int pxa27x_set_wake(struct irq_data *d, unsigned int on) |
347 | { | 348 | { |
348 | int gpio = IRQ_TO_GPIO(irq); | 349 | int gpio = IRQ_TO_GPIO(d->irq); |
349 | uint32_t mask; | 350 | uint32_t mask; |
350 | 351 | ||
351 | if (gpio >= 0 && gpio < 128) | 352 | if (gpio >= 0 && gpio < 128) |
352 | return gpio_set_wake(gpio, on); | 353 | return gpio_set_wake(gpio, on); |
353 | 354 | ||
354 | if (irq == IRQ_KEYPAD) | 355 | if (d->irq == IRQ_KEYPAD) |
355 | return keypad_set_wake(on); | 356 | return keypad_set_wake(on); |
356 | 357 | ||
357 | switch (irq) { | 358 | switch (d->irq) { |
358 | case IRQ_RTCAlrm: | 359 | case IRQ_RTCAlrm: |
359 | mask = PWER_RTC; | 360 | mask = PWER_RTC; |
360 | break; | 361 | break; |