From patchwork Mon Feb 1 18:28:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 8182741 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3510BBEEE5 for ; Mon, 1 Feb 2016 18:28:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4AFE4202BE for ; Mon, 1 Feb 2016 18:28:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4189B203AB for ; Mon, 1 Feb 2016 18:28:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752725AbcBAS2f (ORCPT ); Mon, 1 Feb 2016 13:28:35 -0500 Received: from foss.arm.com ([217.140.101.70]:50857 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752320AbcBAS2c (ORCPT ); Mon, 1 Feb 2016 13:28:32 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B745E54E; Mon, 1 Feb 2016 10:27:48 -0800 (PST) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.207.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1349B3F246; Mon, 1 Feb 2016 10:28:30 -0800 (PST) From: Sudeep Holla To: linux-arm-kernel@lists.infradead.org, Tony Lindgren , Grygorii Strashko Cc: Sudeep Holla , linux-omap@vger.kernel.org, linux-gpio@vger.kernel.org, Linus Walleij Subject: [PATCH 3/3] ARM: OMAP2+: remove misuse of IRQF_NO_SUSPEND flag Date: Mon, 1 Feb 2016 18:28:19 +0000 Message-Id: <1454351299-27440-4-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454351299-27440-1-git-send-email-sudeep.holla@arm.com> References: <1454351299-27440-1-git-send-email-sudeep.holla@arm.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The IRQF_NO_SUSPEND flag is used to identify the interrupts that should be left enabled so as to allow them to work as expected during the suspend-resume cycle, but doesn't guarantee that it will wake the system from a suspended state, enable_irq_wake is recommended to be used for the wakeup. This patch removes the use of IRQF_NO_SUSPEND flags replacing it with enable_irq_wake instead. Cc: Grygorii Strashko Cc: Tony Lindgren Cc: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Sudeep Holla --- arch/arm/mach-omap2/mux.c | 4 ++-- arch/arm/mach-omap2/pm34xx.c | 9 ++++----- arch/arm/mach-omap2/prm_common.c | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 176eef6ef338..12012bef8e63 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -810,13 +810,13 @@ int __init omap_mux_late_init(void) return 0; ret = request_irq(omap_prcm_event_to_irq("io"), - omap_hwmod_mux_handle_irq, IRQF_SHARED | IRQF_NO_SUSPEND, + omap_hwmod_mux_handle_irq, IRQF_SHARED, "hwmod_io", omap_mux_late_init); if (ret) pr_warn("mux: Failed to setup hwmod io irq %d\n", ret); - return 0; + return enable_irq_wake(omap_prcm_event_to_irq("io")); } static void __init omap_mux_package_fixup(struct omap_mux *p, diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 2dbd3785ee6f..49604e0023c4 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -472,23 +472,22 @@ int __init omap3_pm_init(void) prcm_setup_regs(); ret = request_irq(omap_prcm_event_to_irq("wkup"), - _prcm_int_handle_wakeup, IRQF_NO_SUSPEND, "pm_wkup", NULL); + _prcm_int_handle_wakeup, 0, "pm_wkup", NULL); if (ret) { pr_err("pm: Failed to request pm_wkup irq\n"); goto err1; } + enable_irq_wake(omap_prcm_event_to_irq("wkup")); /* IO interrupt is shared with mux code */ ret = request_irq(omap_prcm_event_to_irq("io"), - _prcm_int_handle_io, IRQF_SHARED | IRQF_NO_SUSPEND, "pm_io", - omap3_pm_init); - enable_irq(omap_prcm_event_to_irq("io")); - + _prcm_int_handle_io, IRQF_SHARED, "pm_io", omap3_pm_init); if (ret) { pr_err("pm: Failed to request pm_io irq\n"); goto err2; } + enable_irq_wake(omap_prcm_event_to_irq("io")); ret = pwrdm_for_each(pwrdms_setup, NULL); if (ret) { diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c index 5b2f5138d938..7af688273e0d 100644 --- a/arch/arm/mach-omap2/prm_common.c +++ b/arch/arm/mach-omap2/prm_common.c @@ -338,6 +338,7 @@ int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup) ct->chip.irq_ack = irq_gc_ack_set_bit; ct->chip.irq_mask = irq_gc_mask_clr_bit; ct->chip.irq_unmask = irq_gc_mask_set_bit; + ct->chip.flags = IRQCHIP_SKIP_SET_WAKE; ct->regs.ack = irq_setup->ack + i * 4; ct->regs.mask = irq_setup->mask + i * 4;