diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-09 16:41:37 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-09 16:41:37 -0800 |
| commit | 94c16ea6ea75f8f5de92d10a647155ccf0d05436 (patch) | |
| tree | 012d247bf686e1c49ef3ad0048b94de4970c066b /drivers/mfd/db8500-prcmu.c | |
| parent | cf55f672c325f234d96911571a775b2e7d9cf284 (diff) | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
| download | linux-94c16ea6ea75f8f5de92d10a647155ccf0d05436.tar.bz2 | |
Merge tag 'v3.8-rc6' into next/cleanup
Linux 3.8-rc6
Diffstat (limited to 'drivers/mfd/db8500-prcmu.c')
| -rw-r--r-- | drivers/mfd/db8500-prcmu.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index d9fedd4d9194..6658f3cb0832 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -2522,7 +2522,7 @@ static bool read_mailbox_0(void) for (n = 0; n < NUM_PRCMU_WAKEUPS; n++) { if (ev & prcmu_irq_bit[n]) - generic_handle_irq(IRQ_PRCMU_BASE + n); + generic_handle_irq(irq_find_mapping(db8500_irq_domain, n)); } r = true; break; @@ -2735,13 +2735,14 @@ static int db8500_irq_map(struct irq_domain *d, unsigned int virq, } static struct irq_domain_ops db8500_irq_ops = { - .map = db8500_irq_map, - .xlate = irq_domain_xlate_twocell, + .map = db8500_irq_map, + .xlate = irq_domain_xlate_twocell, }; static int db8500_irq_init(struct device_node *np) { - int irq_base = -1; + int irq_base = 0; + int i; /* In the device tree case, just take some IRQs */ if (!np) @@ -2756,6 +2757,10 @@ static int db8500_irq_init(struct device_node *np) return -ENOSYS; } + /* All wakeups will be used, so create mappings for all */ + for (i = 0; i < NUM_PRCMU_WAKEUPS; i++) + irq_create_mapping(db8500_irq_domain, i); + return 0; } |