diff options
author | Magnus Damm <damm@opensource.se> | 2012-03-06 03:36:14 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-12 17:19:44 -0400 |
commit | 08ad42fb7702ee2968b5b837e245ca8fd2175223 (patch) | |
tree | a9ff0a145d9ea8865df3ad07421f3f7f580b6cf8 | |
parent | e3b0161b3c846e7ce994bb5d1671e1ed5c871915 (diff) |
ARM: mach-shmobile: add shmobile_earlytimer_init()
Add shmobile_earlytimer_init() that can be used to
enable the earlytimer probing from the SoC code.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/common.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/timer.c | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index f005ac0e462..e41b61a4843 100644 --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __ARCH_MACH_COMMON_H | 1 | #ifndef __ARCH_MACH_COMMON_H |
2 | #define __ARCH_MACH_COMMON_H | 2 | #define __ARCH_MACH_COMMON_H |
3 | 3 | ||
4 | extern void shmobile_earlytimer_init(void); | ||
4 | extern struct sys_timer shmobile_timer; | 5 | extern struct sys_timer shmobile_timer; |
5 | extern void shmobile_setup_console(void); | 6 | extern void shmobile_setup_console(void); |
6 | extern void shmobile_secondary_vector(void); | 7 | extern void shmobile_secondary_vector(void); |
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c index 895794b543c..e5106434355 100644 --- a/arch/arm/mach-shmobile/timer.c +++ b/arch/arm/mach-shmobile/timer.c | |||
@@ -36,11 +36,16 @@ static void __init shmobile_late_time_init(void) | |||
36 | early_platform_driver_probe("earlytimer", 2, 0); | 36 | early_platform_driver_probe("earlytimer", 2, 0); |
37 | } | 37 | } |
38 | 38 | ||
39 | static void __init shmobile_timer_init(void) | 39 | void __init shmobile_earlytimer_init(void) |
40 | { | 40 | { |
41 | late_time_init = shmobile_late_time_init; | 41 | late_time_init = shmobile_late_time_init; |
42 | } | 42 | } |
43 | 43 | ||
44 | static void __init shmobile_timer_init(void) | ||
45 | { | ||
46 | shmobile_earlytimer_init(); | ||
47 | } | ||
48 | |||
44 | struct sys_timer shmobile_timer = { | 49 | struct sys_timer shmobile_timer = { |
45 | .init = shmobile_timer_init, | 50 | .init = shmobile_timer_init, |
46 | }; | 51 | }; |