From patchwork Thu Nov 22 08:00:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 1783131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id DC015DF24C for ; Thu, 22 Nov 2012 08:09:34 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbRnl-0005Ur-8k; Thu, 22 Nov 2012 08:06:26 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TbRif-0002IY-OA for linux-arm-kernel@lists.infradead.org; Thu, 22 Nov 2012 08:01:10 +0000 Received: by mail-pa0-f49.google.com with SMTP id bi1so2594481pad.36 for ; Thu, 22 Nov 2012 00:01:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=SMElO+Bdjl7qirPV5pNmfj7OPRd5ciZe7cJ3pAmU8js=; b=V5EYEke2glzGobKqOFHyDyZX0oHaw7kH2uyj+qPnZGyNkElg2qV1I4C1OwdOWJZbZJ cWt/YAw6AOe4HI9FNzv0ZX6rNC+Pdn/TkaFWQ4Sv0ooyis8ZDNBEzhpcpb7k7OFs6RXw dTv6zXTEKULGqnTKp4gnDD9QWYkePlJq0LW1XhxM/UQxSWToCx6c6FDnbgrIZyqNut2c WIQ0DtPLMXh0ad3apvyZ4ybssD7e1kFO9IPoorjyzb/OkDdabTf+HmQoaTn99bp9ZSVj vWKArvhBT3M9ZdpI1OzfoRAqVI/EkrIC06neJ7uiItSZBtyobjA0HJfM6Y9AEboXikQp e0gA== Received: by 10.66.81.97 with SMTP id z1mr24668202pax.19.1353571269469; Thu, 22 Nov 2012 00:01:09 -0800 (PST) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPS id s1sm1507624paz.0.2012.11.22.00.01.07 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Nov 2012 00:01:08 -0800 (PST) From: Nobuhiro Iwamatsu To: linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 15/15] ARM: shmobile: sh73a0: Use DT for GIC Date: Thu, 22 Nov 2012 17:00:12 +0900 Message-Id: <1353571213-26006-16-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1353571213-26006-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> References: <1353571213-26006-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Gm-Message-State: ALoCoQl/XdMlMycBpp0r1QV8klRwbtBUM833eqHNGjxEPIod56g7PXgRQlEAoHQ3CfB/Iu0l5gQq X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121122_030110_002870_0A725CB8 X-CRM114-Status: GOOD ( 11.78 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Magnus Damm , horms@verge.net.au, magnus.damm@gmail.com, Nobuhiro Iwamatsu X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Simon Horman Cc: Magnus Damm Cc: Nobuhiro Iwamatsu Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/intc-sh73a0.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c index c9f6441..f4076e2 100644 --- a/arch/arm/mach-shmobile/intc-sh73a0.c +++ b/arch/arm/mach-shmobile/intc-sh73a0.c @@ -429,12 +429,9 @@ static irqreturn_t sh73a0_pint1_demux(int irq, void *dev_id) static void __init sh73a0_init_intc(resource_size_t intcs0_start) { - int k, n; - void __iomem *intevtsa; - - intevtsa = ioremap_nocache(intcs0_start + 0x100, PAGE_SIZE); + void __iomem *intevtsa = + ioremap_nocache(intcs0_start + 0x100, PAGE_SIZE); - /* demux using INTEVTSA */ sh73a0_intcs_cascade.name = "INTCS cascade"; sh73a0_intcs_cascade.handler = sh73a0_intcs_demux; sh73a0_intcs_cascade.dev_id = intevtsa; @@ -500,6 +497,7 @@ static int __init intc_of_init(struct device_node *np, } static const struct of_device_id irq_of_match[] __initconst = { + { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, } { .compatible = "renesas,sh_intc", .data = intc_of_init }, { /*sentinel*/ } }; @@ -514,10 +512,8 @@ void __init sh73a0_init_irq_of(void) void __init sh73a0_init_irq(void) { - void __iomem *gic_dist_base = IOMEM(0xf0001000); - void __iomem *gic_cpu_base = IOMEM(0xf0000100); - gic_init(0, 29, gic_dist_base, gic_cpu_base); + gic_init(0, 29, IOMEM(0xf0001000), IOMEM(0xf0000100)); gic_arch_extn.irq_set_wake = sh73a0_set_wake; register_intc_controller(&intcs_desc);