lkml.org 
[lkml]   [2016]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 09/13] clocksource/drivers/rockchip_timer: move TIMER_INT_UNMASK out of rk_timer_enable()
    Date
    This allow to enable timer without enabling interrupts from it.
    As that mode will be used in clocksource implementation.

    This is refactoring step without functional changes.

    Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com>
    ---
    drivers/clocksource/rockchip_timer.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c
    index a17dc61..61c3bb1 100644
    --- a/drivers/clocksource/rockchip_timer.c
    +++ b/drivers/clocksource/rockchip_timer.c
    @@ -60,8 +60,7 @@ static inline void rk_timer_disable(struct rk_timer *timer)

    static inline void rk_timer_enable(struct rk_timer *timer, u32 flags)
    {
    - writel_relaxed(TIMER_ENABLE | TIMER_INT_UNMASK | flags,
    - timer->ctrl);
    + writel_relaxed(TIMER_ENABLE | flags, timer->ctrl);
    }

    static void rk_timer_update_counter(unsigned long cycles,
    @@ -83,7 +82,8 @@ static inline int rk_timer_set_next_event(unsigned long cycles,

    rk_timer_disable(timer);
    rk_timer_update_counter(cycles, timer);
    - rk_timer_enable(timer, TIMER_MODE_USER_DEFINED_COUNT);
    + rk_timer_enable(timer, TIMER_MODE_USER_DEFINED_COUNT |
    + TIMER_INT_UNMASK);
    return 0;
    }

    @@ -101,7 +101,7 @@ static int rk_timer_set_periodic(struct clock_event_device *ce)

    rk_timer_disable(timer);
    rk_timer_update_counter(timer->freq / HZ - 1, timer);
    - rk_timer_enable(timer, TIMER_MODE_FREE_RUNNING);
    + rk_timer_enable(timer, TIMER_MODE_FREE_RUNNING | TIMER_INT_UNMASK);
    return 0;
    }

    --
    1.7.9.5
    \
     
     \ /
      Last update: 2016-11-29 14:48    [W:2.498 / U:0.624 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site