timer fixes
Linus,
Please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
# HEAD: 9ab2b7f3acfa5490f36c9e5774a2bfecd01943db Merge branch 'clockevents/4.0-rc2' of http://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
Two clocksource driver fixes.
Thanks,
Ingo
------------------>
Yongbae Park (2):
clocksource: efm32: Fix a NULL pointer dereference
clockevents: sun5i: Fix setup_irq init sequence
drivers/clocksource/time-efm32.c | 4 ++-- drivers/clocksource/timer-sun5i.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/clocksource/time-efm32.c +2 -2
@@ -225,12 +225,12 @@ static int __init efm32_clockevent_init(struct device_node *np) clock_event_ddata.base = base; clock_event_ddata.periodic_top =DIV_ROUND_CLOSEST (rate,1024 *HZ ); -setup_irq (irq, &efm32_clock_event_irq); -clockevents_config_and_register (&clock_event_ddata.evtdev,DIV_ROUND_CLOSEST (rate,1024 ),0xf ,0xffff ); +setup_irq (irq, &efm32_clock_event_irq); +return 0 ; err_get_irq:
drivers/clocksource/timer-sun5i.c +4 -4
@@ -178,10 +178,6 @@ static void __init sun5i_timer_init(struct device_node *node) ticks_per_jiffy =DIV_ROUND_UP (rate,HZ ); - ret =setup_irq (irq, &sun5i_timer_irq); -if (ret) -pr_warn ("failed to setup irq %d\n" , irq); -/* Enable timer0 interrupt */ val =readl (timer_base +TIMER_IRQ_EN_REG );writel (val |TIMER_IRQ_EN (0 ), timer_base +TIMER_IRQ_EN_REG );
@@ -191,6 +187,10 @@ static void __init sun5i_timer_init(struct device_node *node)clockevents_config_and_register (&sun5i_clockevent, rate,TIMER_SYNC_TICKS ,0xffffffff ); + + ret =setup_irq (irq, &sun5i_timer_irq); +if (ret) +pr_warn ("failed to setup irq %d\n" , irq); }CLOCKSOURCE_OF_DECLARE (sun5i_a13,"allwinner,sun5i-a13-hstimer" , sun5i_timer_init);