Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755888Ab2FTM3u (ORCPT ); Wed, 20 Jun 2012 08:29:50 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:45398 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753040Ab2FTM3t (ORCPT ); Wed, 20 Jun 2012 08:29:49 -0400 Message-ID: <4FE1C238.7070106@gmail.com> Date: Wed, 20 Jun 2012 07:29:44 -0500 From: Rob Herring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Michal Simek CC: linux-kernel@vger.kernel.org, arnd@arndb.de, John.Linn@xilinx.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2] arm: zynq: Support GIC OF initialization References: <1340173451-14613-1-git-send-email-monstr@monstr.eu> In-Reply-To: <1340173451-14613-1-git-send-email-monstr@monstr.eu> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2047 Lines: 58 On 06/20/2012 01:24 AM, Michal Simek wrote: > Zynq is OF driven platfrom which requires OF initialization. > > Signed-off-by: Michal Simek Acked-by: Rob Herring > > --- > v2: Remove also corresponding defines > --- > arch/arm/mach-zynq/common.c | 7 ++++++- > arch/arm/mach-zynq/include/mach/zynq_soc.h | 2 -- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c > index 17d68d6..7941544 100644 > --- a/arch/arm/mach-zynq/common.c > +++ b/arch/arm/mach-zynq/common.c > @@ -56,12 +56,17 @@ static void __init xilinx_init_machine(void) > of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL); > } > > +static const struct of_device_id zynq_dt_irq_match[] __initconst = { > + { .compatible = "arm,cortex-a9-gic", .data = gic_of_init }, > + { } > +}; > + > /** > * xilinx_irq_init() - Interrupt controller initialization for the GIC. > */ > static void __init xilinx_irq_init(void) > { > - gic_init(0, 29, SCU_GIC_DIST_BASE, SCU_GIC_CPU_BASE); > + of_irq_init(zynq_dt_irq_match); > } > > /* The minimum devices needed to be mapped before the VM system is up and > diff --git a/arch/arm/mach-zynq/include/mach/zynq_soc.h b/arch/arm/mach-zynq/include/mach/zynq_soc.h > index 6ff7015..eab11a0 100644 > --- a/arch/arm/mach-zynq/include/mach/zynq_soc.h > +++ b/arch/arm/mach-zynq/include/mach/zynq_soc.h > @@ -41,9 +41,7 @@ > > #define TTC0_BASE IOMEM(TTC0_VIRT) > #define SCU_PERIPH_BASE IOMEM(SCU_PERIPH_VIRT) > -#define SCU_GIC_CPU_BASE (SCU_PERIPH_BASE + 0x100) > #define SCU_CPU_TIMER_BASE (SCU_PERIPH_BASE + 0x600) > -#define SCU_GIC_DIST_BASE (SCU_PERIPH_BASE + 0x1000) > #define PL310_L2CC_BASE IOMEM(PL310_L2CC_VIRT) > > /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/