Skip to content

Commit bd5a193

Browse files
Zhen Leidlezcano
authored andcommitted
clocksource/drivers/sp804: Add support for Hisilicon sp804 timer
The ARM SP804 supports a maximum of 32-bit counter, but Hisilicon extends it to 64-bit. That means, the registers: TimerXload, TimerXValue and TimerXBGLoad are 64bits, all other registers are the same as those in the SP804. The driver code can be completely reused except that the register offset is different. Use compatible = "hisilicon,sp804" mark as Hisilicon sp804 timer. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20200918132237.3552-8-thunder.leizhen@huawei.com
1 parent 23c788c commit bd5a193

1 file changed

Lines changed: 27 additions & 0 deletions

File tree

drivers/clocksource/timer-sp804.c

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,18 @@
2020

2121
#include "timer-sp.h"
2222

23+
/* Hisilicon 64-bit timer(a variant of ARM SP804) */
24+
#define HISI_TIMER_1_BASE 0x00
25+
#define HISI_TIMER_2_BASE 0x40
26+
#define HISI_TIMER_LOAD 0x00
27+
#define HISI_TIMER_VALUE 0x08
28+
#define HISI_TIMER_CTRL 0x10
29+
#define HISI_TIMER_INTCLR 0x14
30+
#define HISI_TIMER_RIS 0x18
31+
#define HISI_TIMER_MIS 0x1c
32+
#define HISI_TIMER_BGLOAD 0x20
33+
34+
2335
struct sp804_timer __initdata arm_sp804_timer = {
2436
.load = TIMER_LOAD,
2537
.value = TIMER_VALUE,
@@ -29,6 +41,15 @@ struct sp804_timer __initdata arm_sp804_timer = {
2941
.width = 32,
3042
};
3143

44+
struct sp804_timer __initdata hisi_sp804_timer = {
45+
.load = HISI_TIMER_LOAD,
46+
.value = HISI_TIMER_VALUE,
47+
.ctrl = HISI_TIMER_CTRL,
48+
.intclr = HISI_TIMER_INTCLR,
49+
.timer_base = {HISI_TIMER_1_BASE, HISI_TIMER_2_BASE},
50+
.width = 64,
51+
};
52+
3253
static struct sp804_clkevt sp804_clkevt[NR_TIMERS];
3354

3455
static long __init sp804_get_clock_rate(struct clk *clk, const char *name)
@@ -315,6 +336,12 @@ static int __init arm_sp804_of_init(struct device_node *np)
315336
}
316337
TIMER_OF_DECLARE(sp804, "arm,sp804", arm_sp804_of_init);
317338

339+
static int __init hisi_sp804_of_init(struct device_node *np)
340+
{
341+
return sp804_of_init(np, &hisi_sp804_timer);
342+
}
343+
TIMER_OF_DECLARE(hisi_sp804, "hisilicon,sp804", hisi_sp804_of_init);
344+
318345
static int __init integrator_cp_of_init(struct device_node *np)
319346
{
320347
static int init_count = 0;

0 commit comments

Comments
 (0)