Commit c8af34b4 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Daniel Lezcano

clocksource: armada-370-xp: Use atomic access for shared registers

Replace the driver-specific thread-safe shared register API
by the recently introduced atomic_io_clear_set().
Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 0a54a069
...@@ -85,12 +85,6 @@ static u32 ticks_per_jiffy; ...@@ -85,12 +85,6 @@ static u32 ticks_per_jiffy;
static struct clock_event_device __percpu *armada_370_xp_evt; static struct clock_event_device __percpu *armada_370_xp_evt;
static void timer_ctrl_clrset(u32 clr, u32 set)
{
writel((readl(timer_base + TIMER_CTRL_OFF) & ~clr) | set,
timer_base + TIMER_CTRL_OFF);
}
static void local_timer_ctrl_clrset(u32 clr, u32 set) static void local_timer_ctrl_clrset(u32 clr, u32 set)
{ {
writel((readl(local_base + TIMER_CTRL_OFF) & ~clr) | set, writel((readl(local_base + TIMER_CTRL_OFF) & ~clr) | set,
...@@ -245,7 +239,7 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np) ...@@ -245,7 +239,7 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np)
clr = TIMER0_25MHZ; clr = TIMER0_25MHZ;
enable_mask = TIMER0_EN | TIMER0_DIV(TIMER_DIVIDER_SHIFT); enable_mask = TIMER0_EN | TIMER0_DIV(TIMER_DIVIDER_SHIFT);
} }
timer_ctrl_clrset(clr, set); atomic_io_modify(timer_base + TIMER_CTRL_OFF, clr | set, set);
local_timer_ctrl_clrset(clr, set); local_timer_ctrl_clrset(clr, set);
/* /*
...@@ -263,7 +257,9 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np) ...@@ -263,7 +257,9 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np)
writel(0xffffffff, timer_base + TIMER0_VAL_OFF); writel(0xffffffff, timer_base + TIMER0_VAL_OFF);
writel(0xffffffff, timer_base + TIMER0_RELOAD_OFF); writel(0xffffffff, timer_base + TIMER0_RELOAD_OFF);
timer_ctrl_clrset(0, TIMER0_RELOAD_EN | enable_mask); atomic_io_modify(timer_base + TIMER_CTRL_OFF,
TIMER0_RELOAD_EN | enable_mask,
TIMER0_RELOAD_EN | enable_mask);
/* /*
* Set scale and timer for sched_clock. * Set scale and timer for sched_clock.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment