[PATCH v2 19/19] ARM: at91/board-dt: move at91_initialize() to init_irq()
From: Nicolas Ferre <hidden>
Date: 2012-02-22 09:41:46
Also in:
lkml
Subsystem:
arm port, arm/microchip (at91) soc support, the rest · Maintainers:
Russell King, Nicolas Ferre, Alexandre Belloni, Claudiu Beznea, Linus Torvalds
From: Jean-Christophe PLAGNIOL-VILLARD <redacted> Remove the need for at91_initialize() to be called at init_early(). We move it to init_irq() function as we still need it before the timer initialization. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <redacted> Acked-by: Nicolas Ferre <redacted> --- arch/arm/mach-at91/board-dt.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt.c
index 08c8ad8..8868b3c 100644
--- a/arch/arm/mach-at91/board-dt.c
+++ b/arch/arm/mach-at91/board-dt.c@@ -34,12 +34,6 @@ #include "generic.h" -static void __init ek_init_early(void) -{ - /* Initialize processor: 12.000 MHz crystal */ - at91_initialize(12000000); -} - /* det_pin is not connected */ static struct atmel_nand_data __initdata ek_nand_data = { .ale = 21,
@@ -89,6 +83,9 @@ static const struct of_device_id aic_of_match[] __initconst = { static void __init at91_dt_init_irq(void) { + /* Initialize processor: 12.000 MHz crystal */ + at91_initialize(12000000); + irq_domain_generate_simple(aic_of_match, 0xfffff000, 0); at91_init_irq_default(); }
@@ -112,7 +109,6 @@ DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") /* Maintainer: Atmel */ .timer = &at91sam926x_timer, .map_io = at91_map_io, - .init_early = ek_init_early, .init_irq = at91_dt_init_irq, .init_machine = at91_dt_device_init, .dt_compat = at91_dt_board_compat,
--
1.7.9