diff options
author | Boris BREZILLON <boris.brezillon@free-electrons.com> | 2014-07-10 13:14:21 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-08-19 14:32:49 -0400 |
commit | 3b26f39b0ab1f390365701981e831aa128e3e4ac (patch) | |
tree | 166bdb960f9231e1c986e034128fb27c960f3c1a /arch/arm/mach-at91/board-dt-sam9.c | |
parent | 071926041e5b38f84f2aaac2122c57e398e535b5 (diff) |
ARM: at91: make use of the new AIC driver for dt enabled boards
Remove selection of OLD_IRQ_AT91 when selecting dt boards.
Select ATMEL_AIC_IRQ for sama5 SoCs (a kernel compiled for this SoC will
always use ATMEL_AIC_IRQ driver).
Select ATMEL_AIC_IRQ for at91rm9200 and at91sam9 SoCs only if OLD_IRQ_AT91
is not selected (which means we are compiling a pure DT kernel, without
any legacy board support).
Remove specific irq init code in all dt board files: this init procedure
is automatically handled in of_irq_init which is called by the arm irq core
code and is in charge of calling the appropriate aic init functions.
Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/board-dt-sam9.c')
-rw-r--r-- | arch/arm/mach-at91/board-dt-sam9.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c index 575b0be66ca8..dfa8d48146fe 100644 --- a/arch/arm/mach-at91/board-dt-sam9.c +++ b/arch/arm/mach-at91/board-dt-sam9.c | |||
@@ -34,17 +34,6 @@ static void __init sam9_dt_timer_init(void) | |||
34 | at91sam926x_pit_init(); | 34 | at91sam926x_pit_init(); |
35 | } | 35 | } |
36 | 36 | ||
37 | static const struct of_device_id irq_of_match[] __initconst = { | ||
38 | |||
39 | { .compatible = "atmel,at91rm9200-aic", .data = at91_aic_of_init }, | ||
40 | { /*sentinel*/ } | ||
41 | }; | ||
42 | |||
43 | static void __init at91_dt_init_irq(void) | ||
44 | { | ||
45 | of_irq_init(irq_of_match); | ||
46 | } | ||
47 | |||
48 | static const char *at91_dt_board_compat[] __initdata = { | 37 | static const char *at91_dt_board_compat[] __initdata = { |
49 | "atmel,at91sam9", | 38 | "atmel,at91sam9", |
50 | NULL | 39 | NULL |
@@ -54,8 +43,6 @@ DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") | |||
54 | /* Maintainer: Atmel */ | 43 | /* Maintainer: Atmel */ |
55 | .init_time = sam9_dt_timer_init, | 44 | .init_time = sam9_dt_timer_init, |
56 | .map_io = at91_map_io, | 45 | .map_io = at91_map_io, |
57 | .handle_irq = at91_aic_handle_irq, | ||
58 | .init_early = at91_dt_initialize, | 46 | .init_early = at91_dt_initialize, |
59 | .init_irq = at91_dt_init_irq, | ||
60 | .dt_compat = at91_dt_board_compat, | 47 | .dt_compat = at91_dt_board_compat, |
61 | MACHINE_END | 48 | MACHINE_END |