From patchwork Wed Aug 22 09:12:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10864 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id BC80523F70 for ; Wed, 22 Aug 2012 09:12:42 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 5862DA18014 for ; Wed, 22 Aug 2012 09:12:31 +0000 (UTC) Received: by ggmi2 with SMTP id i2so510609ggm.11 for ; Wed, 22 Aug 2012 02:12:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=me5ZM2Mo59yXO68EV0vpbfxIBUupOW8eOLV2TaD8D6I=; b=P5tVS3Y1lUZvHfRyHf8TKY0UVlZDUCmVld8jF2bivP2XDNydLuQrLzStzGTUCPxLcP Dvr7UoYOrDWTktoZsq68T4/dvaIvFFcRVWIocpvr2kbARa12XKTQ83o0hqfY0i/Wm+oT yvb5j8mFAaKZ/eC5N2l92fUZyptQzLw+4BI8xGNfrOdHuS5jYcNmForRAJKppz1q+1f4 ATP0BHm3v1Q5h5+s4/ixRTDKjO/q6ShLhzWQjUVOmcSpeSeMt8th/sNF0RzW2WQzRBzf soXySTIOC395xvZQEaN96eH6wZaZqIyDTo1NT8bCz50t+f84YX82m1vkN8hMe5pK2Xao 6wOg== Received: by 10.50.45.162 with SMTP id o2mr1428709igm.0.1345626761232; Wed, 22 Aug 2012 02:12:41 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp191232igc; Wed, 22 Aug 2012 02:12:39 -0700 (PDT) Received: by 10.14.223.72 with SMTP id u48mr17584199eep.37.1345626758870; Wed, 22 Aug 2012 02:12:38 -0700 (PDT) Received: from eu1sys200aog118.obsmtp.com (eu1sys200aog118.obsmtp.com. [207.126.144.145]) by mx.google.com with SMTP id m5si2358540een.75.2012.08.22.02.12.34 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Aug 2012 02:12:38 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.145 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.145; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.145 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob118.postini.com ([207.126.147.11]) with SMTP ID DSNKUDSigo9q+dyVV76MD3j3qSMUB7AHAdnI@postini.com; Wed, 22 Aug 2012 09:12:38 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 2248449; Wed, 22 Aug 2012 09:12:06 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 117AC4D; Wed, 22 Aug 2012 05:29:27 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 3D8F924C334; Wed, 22 Aug 2012 11:12:27 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 22 Aug 2012 11:12:32 +0200 From: Linus Walleij To: Cc: Linus Walleij Subject: [PATCH] ARM: ux500: implement set_wake() callback for the GIC Date: Wed, 22 Aug 2012 11:12:28 +0200 Message-ID: <1345626748-29057-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmXTzwdO7q0vcepFnEq8zZDlt9t0vmFK8tSda82eVTMYe9f6kyRh3nPtc8uROYIm4S8OsUv From: Linus Walleij The Ux500 will be able to wake up on any IRQ, so implement a .set_wake() callback that just returns 0 instead of the default in common/gic.c which returns an error if you try to set wakeup on the GIC. Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/cpu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index e2360e7..24598e2 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -46,11 +46,18 @@ static const struct of_device_id ux500_dt_irq_match[] = { {}, }; +static int ux500_gic_irq_set_wake(struct irq_data *d, unsigned int on) +{ + return 0; +} + void __init ux500_init_irq(void) { void __iomem *dist_base; void __iomem *cpu_base; + gic_arch_extn.irq_set_wake = ux500_gic_irq_set_wake; + if (cpu_is_u8500_family()) { dist_base = __io_address(U8500_GIC_DIST_BASE); cpu_base = __io_address(U8500_GIC_CPU_BASE);