From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754167AbaIAOhj (ORCPT ); Mon, 1 Sep 2014 10:37:39 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:44369 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753823AbaIAOhi (ORCPT ); Mon, 1 Sep 2014 10:37:38 -0400 From: Charles Keepax To: lee.jones@linaro.org Cc: sameo@linux.intel.com, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org Subject: [PATCH] mfd: arizona: Propagate irq_wake through to parent IRQ Date: Mon, 1 Sep 2014 15:29:11 +0100 Message-Id: <1409581751-23724-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.2.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/mfd/arizona-irq.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) Hi, Just thought I would resend this one on its own as it is a good bug fix and didn't need to depend on the other extra callbacks patch. And it would be good to get it in whilst I work on the IRQ stuff. Thanks, Charles diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c index 9133d51..5e2f450 100644 --- a/drivers/mfd/arizona-irq.c +++ b/drivers/mfd/arizona-irq.c @@ -152,10 +152,18 @@ static void arizona_irq_disable(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_disable, .irq_enable = arizona_irq_enable, + .irq_set_wake = arizona_irq_set_wake, }; static int arizona_irq_map(struct irq_domain *h, unsigned int virq, -- 1.7.2.5