Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753802Ab2FTGYU (ORCPT ); Wed, 20 Jun 2012 02:24:20 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:49710 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658Ab2FTGYS (ORCPT ); Wed, 20 Jun 2012 02:24:18 -0400 From: Michal Simek To: linux-kernel@vger.kernel.org Cc: robherring2@gmail.com, arnd@arndb.de, John.Linn@xilinx.com, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, Michal Simek Subject: [PATCH v2] arm: zynq: Support GIC OF initialization Date: Wed, 20 Jun 2012 08:24:11 +0200 Message-Id: <1340173451-14613-1-git-send-email-monstr@monstr.eu> X-Mailer: git-send-email 1.7.0.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1869 Lines: 56 Zynq is OF driven platfrom which requires OF initialization. Signed-off-by: Michal Simek --- 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) /* -- 1.7.0.4 -- 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/