From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 1/2] ARM: shmobile: sh73a0: Use generic irqchip_init()
Date: Mon, 21 Jan 2013 00:54:39 +0000 [thread overview]
Message-ID: <20130121005439.GF19062@verge.net.au> (raw)
In-Reply-To: <1358493373-28722-1-git-send-email-thierry.reding@avionic-design.de>
On Fri, Jan 18, 2013 at 08:16:12AM +0100, Thierry Reding wrote:
> The asm/hardware/gic.h header does no longer exist and the corresponding
> functionality was moved to linux/irqchip.h and linux/irqchip/arm-gic.h
> respectively. gic_handle_irq() and of_irq_init() are no longer available
> either and have been replaced by irqchip_init().
asm/hardware/gic.h Seems to still exist in Linus's tree.
Could you let me know which tree of which branch I should depend on
in order to apply this change?
>
> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
> ---
> Changes in v2:
> - split off kzm9g board changes into a separate patch
>
> arch/arm/mach-shmobile/intc-sh73a0.c | 9 ++-------
> arch/arm/mach-shmobile/setup-sh73a0.c | 2 --
> 2 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
> index fc7c8da..91faba6 100644
> --- a/arch/arm/mach-shmobile/intc-sh73a0.c
> +++ b/arch/arm/mach-shmobile/intc-sh73a0.c
> @@ -21,9 +21,9 @@
> #include <linux/interrupt.h>
> #include <linux/module.h>
> #include <linux/irq.h>
> -#include <linux/of_irq.h>
> #include <linux/io.h>
> #include <linux/sh_intc.h>
> +#include <linux/irqchip.h>
> #include <linux/irqchip/arm-gic.h>
> #include <mach/intc.h>
> #include <mach/irqs.h>
> @@ -462,14 +462,9 @@ void __init sh73a0_init_irq(void)
> }
>
> #ifdef CONFIG_OF
> -static const struct of_device_id irq_of_match[] __initconst = {
> - { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
> - { },
> -};
> -
> void __init sh73a0_init_irq_dt(void)
> {
> - of_irq_init(irq_of_match);
> + irqchip_init();
> gic_arch_extn.irq_set_wake = sh73a0_set_wake;
> }
> #endif
> diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
> index abf1eb0..2ecd668 100644
> --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> @@ -36,7 +36,6 @@
> #include <mach/irqs.h>
> #include <mach/sh73a0.h>
> #include <mach/common.h>
> -#include <asm/hardware/gic.h>
> #include <asm/mach-types.h>
> #include <asm/mach/map.h>
> #include <asm/mach/arch.h>
> @@ -892,7 +891,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
> .init_early = sh73a0_add_early_devices_dt,
> .nr_irqs = NR_IRQS_LEGACY,
> .init_irq = sh73a0_init_irq_dt,
> - .handle_irq = gic_handle_irq,
> .init_machine = sh73a0_add_standard_devices_dt,
> .init_time = shmobile_timer_init,
> .dt_compat = sh73a0_boards_compat_dt,
> --
> 1.8.1.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2013-01-21 0:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-18 7:16 [PATCH v2 1/2] ARM: shmobile: sh73a0: Use generic irqchip_init() Thierry Reding
2013-01-18 7:16 ` [PATCH v2 2/2] ARM: shmobile: kzm9g: Don't use gic_handle_irq() Thierry Reding
2013-01-21 0:54 ` Simon Horman [this message]
2013-01-21 7:03 ` [PATCH v2 1/2] ARM: shmobile: sh73a0: Use generic irqchip_init() Thierry Reding
2013-01-22 0:18 ` Simon Horman
2013-01-22 7:29 ` Olof Johansson
2013-01-22 8:07 ` Simon Horman
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=20130121005439.GF19062@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).