[PATCH] x86: convert to generic irq_domain

Grant Likely grant.likely at secretlab.ca
Tue Jan 17 03:16:03 EST 2012


On Sun, Jan 15, 2012 at 05:35:38PM +0100, Sebastian Andrzej Siewior wrote:
> * Rob Herring | 2011-12-16 23:18:49 [-0600]:
> 
> >From: Grant Likely <grant.likely at secretlab.ca>
> >
> >This is needed to avoid struct collisions with the generic irq_domain
> >support being added to kernel/irq/generic-chip.c.
> >
> >Boot tested, but not on a DT enabled platform.
> 
> If you add this piece into your patch:
> 
> From 34d9bb9b582136c8412e14ad870c8aaaa28c9e15 Mon Sep 17 00:00:00 2001
> From: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
> Date: Sun, 15 Jan 2012 16:52:13 +0100
> Subject: [PATCH] fixup of "x86: convert to generic irq_domain"
> 
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>

It's a little late for 3.3, and I've got a major rework to irq_domain
almost ready which will get merged in 3.4.  I'll rework the patch on
top of that series and get you to retest.

g.

> ---
>  arch/x86/Kconfig             |    1 +
>  arch/x86/kernel/devicetree.c |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index d6f1e91..0d74f88 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -397,6 +397,7 @@ config X86_INTEL_CE
>  	select X86_REBOOTFIXUPS
>  	select OF
>  	select OF_EARLY_FLATTREE
> +	select IRQ_DOMAIN
>  	---help---
>  	  Select for the Intel CE media processor (CE4100) SOC.
>  	  This option compiles in support for the CE4100 SOC for settop
> diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
> index 5632e5b..41eb2a7 100644
> --- a/arch/x86/kernel/devicetree.c
> +++ b/arch/x86/kernel/devicetree.c
> @@ -4,6 +4,7 @@
>  #include <linux/bootmem.h>
>  #include <linux/export.h>
>  #include <linux/io.h>
> +#include <linux/irqdomain.h>
>  #include <linux/interrupt.h>
>  #include <linux/list.h>
>  #include <linux/of.h>
> -- 
> 
> you add my acked-by to it.
> 
> Sebastian


More information about the devicetree-discuss mailing list