diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2011-04-24 06:15:34 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:07:29 -0400 |
commit | 51ddec7617bd0d4c73c44a8862faac5d7d97eb03 (patch) | |
tree | 56cfd6db86147db3138d81ae7c9d2d9e9cfda068 /arch/arm/mach-at91/at91sam9260.c | |
parent | 465393749da3a3229f6067246c7e8f97f7cc833d (diff) |
at91: move register clocks 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/at91sam9260.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9260.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index 40e123fa9cf5..1addfef73b6c 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c | |||
@@ -357,9 +357,6 @@ static void __init at91sam9260_initialize(void) | |||
357 | at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1) | 357 | at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1) |
358 | | (1 << AT91SAM9260_ID_IRQ2); | 358 | | (1 << AT91SAM9260_ID_IRQ2); |
359 | 359 | ||
360 | /* Register the processor-specific clocks */ | ||
361 | at91sam9260_register_clocks(); | ||
362 | |||
363 | /* Register GPIO subsystem */ | 360 | /* Register GPIO subsystem */ |
364 | at91_gpio_init(at91sam9260_gpio, 3); | 361 | at91_gpio_init(at91sam9260_gpio, 3); |
365 | } | 362 | } |
@@ -409,5 +406,6 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = { | |||
409 | struct at91_init_soc __initdata at91sam9260_soc = { | 406 | struct at91_init_soc __initdata at91sam9260_soc = { |
410 | .map_io = at91sam9260_map_io, | 407 | .map_io = at91sam9260_map_io, |
411 | .default_irq_priority = at91sam9260_default_irq_priority, | 408 | .default_irq_priority = at91sam9260_default_irq_priority, |
409 | .register_clocks = at91sam9260_register_clocks, | ||
412 | .init = at91sam9260_initialize, | 410 | .init = at91sam9260_initialize, |
413 | }; | 411 | }; |