Fwd: FW: [PATCH v2] arm: zynq: Support GIC OF initialization
From: John Linn <hidden>
Date: 2012-06-20 16:30:21
Also in:
lkml
-----Original Message----- From: Rob Herring [mailto:robherring2 at gmail.com] Sent: Wednesday, June 20, 2012 5:30 AM To: Michal Simek Cc: linux-kernel at vger.kernel.org; arnd at arndb.de; John Linn; linux at arm.linux.org.uk; linux-arm-kernel at lists.infradead.org Subject: Re: [PATCH v2] arm: zynq: Support GIC OF initialization On 06/20/2012 01:24 AM, Michal Simek wrote:quoted
Zynq is OF driven platfrom which requires OF initialization. Signed-off-by: Michal Simek <monstr@monstr.eu>Acked-by: Rob Herring <redacted>
Acked-by: John Linn <redacted>
quoted
--- 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
quoted
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 =
{quoted
+ ? { .compatible = "arm,cortex-a9-gic", .data = gic_of_init }, + ? { } +}; + ?/** ? * xilinx_irq_init() - Interrupt controller initialization for theGIC.quoted
? */ ?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
andquoted
diff --git a/arch/arm/mach-zynq/include/mach/zynq_soc.hb/arch/arm/mach-zynq/include/mach/zynq_soc.hquoted
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) ?/*