diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-09-02 18:05:04 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-09-03 10:55:45 +0200 |
| commit | d2992e51e799099e319aeaaa8648917954f59a3b (patch) | |
| tree | 9c9f0ede82d89e06a756f3ad93dac20456e70a39 /arch/arm | |
| parent | 64568d1dbd673aca3de8d2a17b9db507c5b85df7 (diff) | |
| download | op-kernel-dev-d2992e51e799099e319aeaaa8648917954f59a3b.zip op-kernel-dev-d2992e51e799099e319aeaaa8648917954f59a3b.tar.gz | |
ARM: at91: soc: Add init_time callback
Introduce an init_time callback to the at91_init_soc structure to be able to
tweak the init_time machine callback on a per-soc basis, instead of having to
rely on a global one.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Conflicts:
arch/arm/mach-at91/setup.c
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-at91/generic.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-at91/soc.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 31cba6d..fb99dab 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -44,6 +44,7 @@ extern void __init at91_sysirq_mask_rtt(u32 rtt_base); extern void __init at91_register_devices(void); /* Timer */ +extern void __init at91_init_time(void); extern void at91rm9200_ioremap_st(u32 addr); extern void at91rm9200_timer_init(void); extern void at91sam926x_ioremap_pit(u32 addr); diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index d2cade2..51c22a2 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -416,3 +416,8 @@ void __init at91_register_devices(void) { at91_boot_soc.register_devices(); } + +void __init at91_init_time(void) +{ + at91_boot_soc.init_time(); +} diff --git a/arch/arm/mach-at91/soc.h b/arch/arm/mach-at91/soc.h index ab983f2c..2886b83 100644 --- a/arch/arm/mach-at91/soc.h +++ b/arch/arm/mach-at91/soc.h @@ -13,6 +13,7 @@ struct at91_init_soc { void (*register_clocks)(void); void (*register_devices)(void); void (*init)(void); + void (*init_time)(void); }; extern struct at91_init_soc at91_boot_soc; |
