On Tue, 12 Aug 2014, Charles Keepax wrote: > If one of the internal Arizona IRQs is set as a wake source this needs > to be propogated back to the actual IRQ line that the Arizona device is > attached to. > > Signed-off-by: Charles Keepax <[email protected]> > --- > drivers/mfd/arizona-irq.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-)
Acked-by: Lee Jones <[email protected]> ... but obviously this won't apply, as it's based on the previous NACKed patch. > diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c > index 71e8f06..fac00b2 100644 > --- a/drivers/mfd/arizona-irq.c > +++ b/drivers/mfd/arizona-irq.c > @@ -148,6 +148,13 @@ static void arizona_irq_dummy(struct irq_data *data) > { > } > > +static int arizona_irq_set_wake(struct irq_data *data, unsigned int on) > +{ > + struct arizona *arizona = irq_data_get_irq_chip_data(data); > + > + return irq_set_irq_wake(arizona->irq, on); > +} > + > static struct irq_chip arizona_irq_chip = { > .name = "arizona", > .irq_disable = arizona_irq_dummy, > @@ -155,6 +162,7 @@ static struct irq_chip arizona_irq_chip = { > .irq_ack = arizona_irq_dummy, > .irq_mask = arizona_irq_dummy, > .irq_unmask = arizona_irq_dummy, > + .irq_set_wake = arizona_irq_set_wake, > }; > > static int arizona_irq_map(struct irq_domain *h, unsigned int virq, -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

