Commit 1e5f0519 authored by Sudeep Holla's avatar Sudeep Holla Committed by Russell King

ARM: 8365/1: introduce sp804_timer_disable and remove arm_timer.h inclusion

The header asm/hardware/arm_timer.h is included in various machine
specific files to access TIMER_CTRL and initialise to a known state.

This patch introduces a new function sp804_timer_disable to disable
the SP804 timers and uses the same for initialising the timers to
known(off) state, thereby removing the dependency on the header
asm/hardware/arm_timer.h

This change is in prepartion to move sp804 timer support out of arch/arm
so that it can be used on ARM64 platforms.

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 73c430bf
...@@ -71,6 +71,11 @@ static u64 notrace sp804_read(void) ...@@ -71,6 +71,11 @@ static u64 notrace sp804_read(void)
return ~readl_relaxed(sched_clock_base + TIMER_VALUE); return ~readl_relaxed(sched_clock_base + TIMER_VALUE);
} }
void __init sp804_timer_disable(void __iomem *base)
{
writel(0, base + TIMER_CTRL);
}
void __init __sp804_clocksource_and_sched_clock_init(void __iomem *base, void __init __sp804_clocksource_and_sched_clock_init(void __iomem *base,
const char *name, const char *name,
struct clk *clk, struct clk *clk,
......
...@@ -4,6 +4,7 @@ void __sp804_clocksource_and_sched_clock_init(void __iomem *, ...@@ -4,6 +4,7 @@ void __sp804_clocksource_and_sched_clock_init(void __iomem *,
const char *, struct clk *, int); const char *, struct clk *, int);
void __sp804_clockevents_init(void __iomem *, unsigned int, void __sp804_clockevents_init(void __iomem *, unsigned int,
struct clk *, const char *); struct clk *, const char *);
void sp804_timer_disable(void __iomem *);
static inline void sp804_clocksource_init(void __iomem *base, const char *name) static inline void sp804_clocksource_init(void __iomem *base, const char *name)
{ {
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/termios.h> #include <linux/termios.h>
#include <asm/hardware/arm_timer.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/param.h> /* HZ */ #include <asm/param.h> /* HZ */
#include <asm/mach-types.h> #include <asm/mach-types.h>
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/hardware/arm_timer.h>
#include <asm/hardware/icst.h> #include <asm/hardware/icst.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
...@@ -381,10 +380,10 @@ void __init realview_timer_init(unsigned int timer_irq) ...@@ -381,10 +380,10 @@ void __init realview_timer_init(unsigned int timer_irq)
/* /*
* Initialise to a known state (all timers off) * Initialise to a known state (all timers off)
*/ */
writel(0, timer0_va_base + TIMER_CTRL); sp804_timer_disable(timer0_va_base);
writel(0, timer1_va_base + TIMER_CTRL); sp804_timer_disable(timer1_va_base);
writel(0, timer2_va_base + TIMER_CTRL); sp804_timer_disable(timer2_va_base);
writel(0, timer3_va_base + TIMER_CTRL); sp804_timer_disable(timer3_va_base);
sp804_clocksource_init(timer3_va_base, "timer3"); sp804_clocksource_init(timer3_va_base, "timer3");
sp804_clockevents_init(timer0_va_base, timer_irq, "timer0"); sp804_clockevents_init(timer0_va_base, timer_irq, "timer0");
......
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
#include <linux/reboot.h> #include <linux/reboot.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/hardware/arm_timer.h>
#include <asm/hardware/icst.h> #include <asm/hardware/icst.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -798,10 +797,10 @@ void __init versatile_timer_init(void) ...@@ -798,10 +797,10 @@ void __init versatile_timer_init(void)
/* /*
* Initialise to a known state (all timers off) * Initialise to a known state (all timers off)
*/ */
writel(0, TIMER0_VA_BASE + TIMER_CTRL); sp804_timer_disable(TIMER0_VA_BASE);
writel(0, TIMER1_VA_BASE + TIMER_CTRL); sp804_timer_disable(TIMER1_VA_BASE);
writel(0, TIMER2_VA_BASE + TIMER_CTRL); sp804_timer_disable(TIMER2_VA_BASE);
writel(0, TIMER3_VA_BASE + TIMER_CTRL); sp804_timer_disable(TIMER3_VA_BASE);
sp804_clocksource_init(TIMER3_VA_BASE, "timer3"); sp804_clocksource_init(TIMER3_VA_BASE, "timer3");
sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1, "timer0"); sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1, "timer0");
......
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