sh: Bump the earlytimer probe devices up.
authorPaul Mundt <lethal@linux-sh.org>
Sun, 14 Jun 2009 11:02:30 +0000 (20:02 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sun, 14 Jun 2009 11:02:30 +0000 (20:02 +0900)
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>
arch/sh/kernel/time.c

index 960d9ab..9b352a1 100644 (file)
@@ -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);
 }