Revert "clocksource: rockchip_timer: always setup_sched_clock"
author黄涛 <huangtao@rock-chips.com>
Fri, 21 Mar 2014 13:01:50 +0000 (21:01 +0800)
committer黄涛 <huangtao@rock-chips.com>
Fri, 21 Mar 2014 13:01:50 +0000 (21:01 +0800)
This reverts commit 3a420a06f9c03ae65c91763af3ff8a1fb8391d6a.

drivers/clocksource/rockchip_timer.c

index 864b27c3fb6d86e32dbd32db4d6043f3b3b2137e..1f74db6a8210c6298410c2bccbc3526f88de8ef3 100644 (file)
@@ -321,12 +321,13 @@ static void __init rk_timer_init(struct device_node *np)
                        rk_delay_timer.read_current_timer = (unsigned long (*)(void))rockchip_read_sched_clock_up;
                }
                rk_timer_init_clocksource(np);
-               if (count_up)
-                       setup_sched_clock(rockchip_read_sched_clock_up, 32, 24000000);
-               else
-                       setup_sched_clock(rockchip_read_sched_clock, 32, 24000000);
-               if (!lpj_fine)
+               if (!lpj_fine) {
+                       if (count_up)
+                               setup_sched_clock(rockchip_read_sched_clock_up, 32, 24000000);
+                       else
+                               setup_sched_clock(rockchip_read_sched_clock, 32, 24000000);
                        register_current_timer_delay(&rk_delay_timer);
+               }
        } else if (of_property_read_u32(np, "rockchip,broadcast", &val) == 0 && val) {
                rk_timer_init_broadcast(np);
        }