From patchwork Fri May 31 21:44:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2645651 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CCE5E3FD2B for ; Fri, 31 May 2013 21:44:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755496Ab3EaVo7 (ORCPT ); Fri, 31 May 2013 17:44:59 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:49736 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752017Ab3EaVo6 (ORCPT ); Fri, 31 May 2013 17:44:58 -0400 Received: by mail-pb0-f46.google.com with SMTP id rq2so2865636pbb.33 for ; Fri, 31 May 2013 14:44:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=+fBFjEVE2evMr0QKT5VJ4xFGrFU6tgDa95GU1Oh4c7U=; b=Jw41JUKESqcf6JrcmwpFz1maWpbYzBAfVhoNcOCNVC9Y7azbmkoKucAj2N1BrvqHWV oiLpjEdUltIG8UIGA3JPP2Atp+aFvtcvwou8Au/oF6/ZUjr37uVY6qoP4gkHuQtPfcyK ZqGJEUZFOYNkdSNiNP/we2Uwq/fWROVKTPUWnvd1Ku8M74wuX8n19oqo/c0/lLwakfFZ 1gJ9r4aAkyCEdw6ygyrEwW2xB7x/tePBiRI7Hb6YdDzLIXfnyhHTTERp7Afm0RZFn8VI fW8slxlzjI90fgkHc9EOic0PZnVq22JFwJXjW3uWkvX396JE4A3EUbk7pdSiqN7u7hsD 8O/Q== X-Received: by 10.66.157.67 with SMTP id wk3mr15520687pab.88.1370036697892; Fri, 31 May 2013 14:44:57 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPSA id qp4sm48177942pbc.41.2013.05.31.14.44.56 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 14:44:56 -0700 (PDT) From: Kevin Hilman To: Samuel Ortiz , Tony Lindgren Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org (open list) Subject: [PATCH] mfd: twl4030: allow IRQ wake enable to succeed on subchip IRQs Date: Fri, 31 May 2013 14:44:54 -0700 Message-Id: <1370036694-26210-1-git-send-email-khilman@linaro.org> X-Mailer: git-send-email 1.8.2 X-Gm-Message-State: ALoCoQnyzfvIjAc8dJz2essE30m6CdT8NoOU46FXgP/1lvIynaZAad36j7BhrybwQlC1OvLsKbnu Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The genirq IRQ wake method will default to failure if the irq_chip does not provide a set_wake method. However, for TWL4030 sub-chip IRQs, we want the wake enable to succeed even though we don't provide a set_wake method. This allows sub-chip IRQs to still be flagged as wakeup capable, and allow them to wakeup from suspend (or abort suspend if they fire during suspend.) To fix, use the IRQCHIP_SKIP_SET_WAKE flag in the irq_chip. Signed-off-by: Kevin Hilman --- drivers/mfd/twl4030-irq.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index a5f9888..3fa7df2 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c @@ -573,6 +573,7 @@ static struct irq_chip twl4030_sih_irq_chip = { .irq_set_type = twl4030_sih_set_type, .irq_bus_lock = twl4030_sih_bus_lock, .irq_bus_sync_unlock = twl4030_sih_bus_sync_unlock, + .flags = IRQCHIP_SKIP_SET_WAKE, }; /*----------------------------------------------------------------------*/