shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "clocksource: rockchip_timer: always setup_sched_clock"

Browse Source 
This reverts commit 3a420a06f9.
This commit is contained in:
黄涛
2014-03-21 21:01:50 +08:00
parent 3a420a06f9
commit 739d8fd834
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/clocksource/rockchip_timer.c
View 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);
}