Zynq is OF driven platfrom which requires OF initialization.
Signed-off-by: Michal Simek <[email protected]>
---
arch/arm/mach-zynq/common.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 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
--
1.7.0.4
On 06/18/2012 06:11 AM, Michal Simek wrote:
> Zynq is OF driven platfrom which requires OF initialization.
>
> Signed-off-by: Michal Simek <[email protected]>
> ---
> arch/arm/mach-zynq/common.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 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);
And delete the corresponding defines?
Rob
> + of_irq_init(zynq_dt_irq_match);
> }
>
> /* The minimum devices needed to be mapped before the VM system is up and
On 06/18/2012 02:06 PM, Rob Herring wrote:
> On 06/18/2012 06:11 AM, Michal Simek wrote:
>> Zynq is OF driven platfrom which requires OF initialization.
>>
>> Signed-off-by: Michal Simek<[email protected]>
>> ---
>> arch/arm/mach-zynq/common.c | 7 ++++++-
>> 1 files changed, 6 insertions(+), 1 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);
>
> And delete the corresponding defines?
Agree, Will create v2.
BTW: Who is responsible for zynq? I think John Linn and who is maintainer I should ask for pulling.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
> -----Original Message-----
> From: Michal Simek [mailto:[email protected]]
> Sent: Monday, June 18, 2012 5:11 AM
> To: Rob Herring
> Cc: [email protected];
[email protected];
> [email protected]; John Linn; [email protected]
> Subject: Re: [PATCH] arm: zynq: Support GIC OF initialization
>
> On 06/18/2012 02:06 PM, Rob Herring wrote:
> > On 06/18/2012 06:11 AM, Michal Simek wrote:
> >> Zynq is OF driven platfrom which requires OF initialization.
> >>
> >> Signed-off-by: Michal Simek<[email protected]>
> >> ---
> >> arch/arm/mach-zynq/common.c | 7 ++++++-
> >> 1 files changed, 6 insertions(+), 1 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);
> >
> > And delete the corresponding defines?
>
> Agree, Will create v2.
>
> BTW: Who is responsible for zynq? I think John Linn and who is
> maintainer I should ask for pulling.
In the past I've acked some patches and they were picked up by others
into the Soc tree I believe.
Thanks,
John
>
> Thanks,
> Michal
>
>
>
>
> --
> Michal Simek, Ing. (M.Eng)
> w: http://www.monstr.eu p: +42-0-721842854
> Maintainer of Linux kernel 2.6 Microblaze Linux -
> http://www.monstr.eu/fdt/
> Microblaze U-BOOT custodian
This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.