From: robherring2@gmail•com (Rob Herring)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2] arm: zynq: Support GIC OF initialization
Date: Wed, 20 Jun 2012 07:29:44 -0500 [thread overview]
Message-ID: <4FE1C238.7070106@gmail.com> (raw)
In-Reply-To: <1340173451-14613-1-git-send-email-monstr@monstr.eu>
On 06/20/2012 01:24 AM, Michal Simek wrote:
> Zynq is OF driven platfrom which requires OF initialization.
>
> Signed-off-by: Michal Simek <monstr@monstr•eu>
Acked-by: Rob Herring <rob.herring@calxeda•com>
>
> ---
> 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)
>
> /*
prev parent reply other threads:[~2012-06-20 12:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-20 6:24 [PATCH v2] arm: zynq: Support GIC OF initialization Michal Simek
2012-06-20 12:29 ` Rob Herring [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FE1C238.7070106@gmail.com \
--to=robherring2@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox