summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2012-03-06 17:36:14 +0900
committerRafael J. Wysocki <rjw@sisk.pl>2012-03-12 22:19:44 +0100
commit08ad42fb7702ee2968b5b837e245ca8fd2175223 (patch)
treea9ff0a145d9ea8865df3ad07421f3f7f580b6cf8
parente3b0161b3c846e7ce994bb5d1671e1ed5c871915 (diff)
downloadlinux-08ad42fb7702ee2968b5b837e245ca8fd2175223.tar.gz
linux-08ad42fb7702ee2968b5b837e245ca8fd2175223.tar.bz2
linux-08ad42fb7702ee2968b5b837e245ca8fd2175223.zip
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.h1
-rw-r--r--arch/arm/mach-shmobile/timer.c7
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 f005ac0e4621..e41b61a48439 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -1,6 +1,7 @@
#ifndef __ARCH_MACH_COMMON_H
#define __ARCH_MACH_COMMON_H
+extern void shmobile_earlytimer_init(void);
extern struct sys_timer shmobile_timer;
extern void shmobile_setup_console(void);
extern void shmobile_secondary_vector(void);
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index 895794b543cd..e51064343553 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)
early_platform_driver_probe("earlytimer", 2, 0);
}
-static void __init shmobile_timer_init(void)
+void __init shmobile_earlytimer_init(void)
{
late_time_init = shmobile_late_time_init;
}
+static void __init shmobile_timer_init(void)
+{
+ shmobile_earlytimer_init();
+}
+
struct sys_timer shmobile_timer = {
.init = shmobile_timer_init,
};