From patchwork Thu Oct 31 16:10:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 3121131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 25BB69F2D6 for ; Thu, 31 Oct 2013 16:13:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC82E20445 for ; Thu, 31 Oct 2013 16:13:32 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A15AD20443 for ; Thu, 31 Oct 2013 16:13:31 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vbur4-00028s-At; Thu, 31 Oct 2013 16:12:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vbuqg-0004PY-UC; Thu, 31 Oct 2013 16:11:55 +0000 Received: from mail-pa0-x229.google.com ([2607:f8b0:400e:c03::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VbuqN-0004Ln-L1 for linux-arm-kernel@lists.infradead.org; Thu, 31 Oct 2013 16:11:37 +0000 Received: by mail-pa0-f41.google.com with SMTP id rd3so2817530pab.0 for ; Thu, 31 Oct 2013 09:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=R0BMfN4qwKd67YwKK2oZ/IpmiQ5MPcokxMF54L6T6Qw=; b=0opw14qdVnnoRUoFhBdrCaWzyhqhkXNv7Ms4l+7hB120AoKsII61QCiAs4Eb51duHG 3nNd4Z4K7VAein9TKnoTM///TiZF5gAQcRq5+c2PVVxxcvv6xdhSFOD4ByCZzaVSI8n1 wLVMQdQkdbmFf+AGF19Y6HbKFDEf/1/LQ0kLWJDAu4UCIHvqpOqY2+lIagmca65IXti6 1YeprTqox8OAGKlpVIoFsy5m/SYmDh41HczNRD4KbjSHEo2ks0c2Eymx157FiAMGGXJL Jnxd7spdjMoboDKL90q16hxF3meNT77ETdXdS+AgQTIyTphsobLaufUKZeBfWZzV/zPP rXnw== X-Received: by 10.68.185.68 with SMTP id fa4mr2771353pbc.136.1383235874681; Thu, 31 Oct 2013 09:11:14 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id pu5sm6394868pac.21.2013.10.31.09.11.13 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 31 Oct 2013 09:11:13 -0700 (PDT) From: Soren Brinkmann To: Michal Simek , Russell King Subject: [PATCH 5/6] arm: zynq: Set proper GIC flags Date: Thu, 31 Oct 2013 09:10:18 -0700 Message-Id: <1383235819-2552-6-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 1.8.4.1 In-Reply-To: <1383235819-2552-1-git-send-email-soren.brinkmann@xilinx.com> References: <1383235819-2552-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131031_121135_818093_B6288BD9 X-CRM114-Status: GOOD ( 11.28 ) X-Spam-Score: -1.9 (-) Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?S=C3=B6ren=20Brinkmann?= X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Zynq is able to wake up on any IRQ, so flag it with IRQCHIP_SKIP_SET_WAKE, and we want to mask off the IRQs when going to suspend to avoid transient effects so also flag this with IRQCHIP_MASK_ON_SUSPEND. This is essentially, making the same changes as commit 'ARM: ux500: set proper GIC flags' (sha1: 7e1f97ea8ffa66679252520dbbbd6ec413ecae68) for Zynq. Signed-off-by: Soren Brinkmann --- arch/arm/mach-zynq/common.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 5690925519bf..eb59bae37c04 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include @@ -86,6 +88,12 @@ static void __init zynq_map_io(void) zynq_scu_map_io(); } +static void __init zynq_irq_init(void) +{ + gic_arch_extn.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND; + irqchip_init(); +} + static void zynq_system_reset(enum reboot_mode mode, const char *cmd) { zynq_slcr_system_reset(); @@ -99,6 +107,7 @@ static const char * const zynq_dt_match[] = { DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") .smp = smp_ops(zynq_smp_ops), .map_io = zynq_map_io, + .init_irq = zynq_irq_init, .init_machine = zynq_init_machine, .init_time = zynq_timer_init, .dt_compat = zynq_dt_match,