diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-04-24 06:20:28 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:07:29 -0400 |
commit | 465393749da3a3229f6067246c7e8f97f7cc833d (patch) | |
tree | f2a8fa3d4c03fd09aed307e6d71805169c71003a /arch/arm/mach-at91/at91rm9200.c | |
parent | 8c3583b634d5705d8f604c0d9392bc273d19c256 (diff) |
at91: move clock subsystem init to soc generic init
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Patrice Vilchez <patrice.vilchez@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200.c')
-rw-r--r-- | arch/arm/mach-at91/at91rm9200.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 36d37bd49cbf..966129793dc8 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c | |||
@@ -309,7 +309,7 @@ static void __init at91rm9200_map_io(void) | |||
309 | iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc)); | 309 | iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc)); |
310 | } | 310 | } |
311 | 311 | ||
312 | static void __init at91rm9200_initialize(unsigned long main_clock) | 312 | static void __init at91rm9200_initialize(void) |
313 | { | 313 | { |
314 | at91_arch_reset = at91rm9200_reset; | 314 | at91_arch_reset = at91rm9200_reset; |
315 | at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1) | 315 | at91_extern_irq = (1 << AT91RM9200_ID_IRQ0) | (1 << AT91RM9200_ID_IRQ1) |
@@ -317,9 +317,6 @@ static void __init at91rm9200_initialize(unsigned long main_clock) | |||
317 | | (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5) | 317 | | (1 << AT91RM9200_ID_IRQ4) | (1 << AT91RM9200_ID_IRQ5) |
318 | | (1 << AT91RM9200_ID_IRQ6); | 318 | | (1 << AT91RM9200_ID_IRQ6); |
319 | 319 | ||
320 | /* Init clock subsystem */ | ||
321 | at91_clock_init(main_clock); | ||
322 | |||
323 | /* Register the processor-specific clocks */ | 320 | /* Register the processor-specific clocks */ |
324 | at91rm9200_register_clocks(); | 321 | at91rm9200_register_clocks(); |
325 | 322 | ||