aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-06-14 20:02:30 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-06-14 20:02:30 +0900
commit6fe32a468521d45edc35d92cdc05cd74e930426a (patch)
tree44d5f23edb460ae9f44bc863eee2c65fef7bb758
parenta34c7e3e7b0e7db67ffef21ba3056eb2f807ba4a (diff)
sh: Bump the earlytimer probe devices up.
Presently the earlytimer probe handles the clockevents driver, which requires that the clockevents driver be registered first. This bumps it up by 1 to include the clocksource device, which can be safely ignored if it doesn't exist, as we will simply error out on that path and defer to the jiffies clocksource. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/kernel/time.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index 960d9abd105..9b352a1e3fb 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -108,8 +108,13 @@ void __init time_init(void)
/*
* Make sure all compiled-in early timers register themselves.
- * Run probe() for one "earlytimer" device.
+ *
+ * Run probe() for two "earlytimer" devices, these will be the
+ * clockevents and clocksource devices respectively. In the event
+ * that only a clockevents device is available, we -ENODEV on the
+ * clocksource and the jiffies clocksource is used transparently
+ * instead. No error handling is necessary here.
*/
early_platform_driver_register_all("earlytimer");
- early_platform_driver_probe("earlytimer", 1, 0);
+ early_platform_driver_probe("earlytimer", 2, 0);
}