Skip to content

Commit 41f8d02

Browse files
Marc Zyngierdlezcano
Marc Zyngier
authored andcommitted
clocksource/drivers/arm_arch_timer: Remove any trace of the TVAL programming interface
TVAL usage is now long gone, get rid of the leftovers. Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20211017124225.3018098-11-maz@kernel.org Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
1 parent 012f188 commit 41f8d02

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

drivers/clocksource/arm_arch_timer.c

-8
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,8 @@
4848
#define CNTPCT_LO 0x08
4949
#define CNTFRQ 0x10
5050
#define CNTP_CVAL_LO 0x20
51-
#define CNTP_TVAL 0x28
5251
#define CNTP_CTL 0x2c
5352
#define CNTV_CVAL_LO 0x30
54-
#define CNTV_TVAL 0x38
5553
#define CNTV_CTL 0x3c
5654

5755
static unsigned arch_timers_present __initdata;
@@ -111,9 +109,6 @@ void arch_timer_reg_write(int access, enum arch_timer_reg reg, u64 val,
111109
case ARCH_TIMER_REG_CTRL:
112110
writel_relaxed((u32)val, timer->base + CNTP_CTL);
113111
break;
114-
case ARCH_TIMER_REG_TVAL:
115-
writel_relaxed((u32)val, timer->base + CNTP_TVAL);
116-
break;
117112
case ARCH_TIMER_REG_CVAL:
118113
/*
119114
* Not guaranteed to be atomic, so the timer
@@ -130,9 +125,6 @@ void arch_timer_reg_write(int access, enum arch_timer_reg reg, u64 val,
130125
case ARCH_TIMER_REG_CTRL:
131126
writel_relaxed((u32)val, timer->base + CNTV_CTL);
132127
break;
133-
case ARCH_TIMER_REG_TVAL:
134-
writel_relaxed((u32)val, timer->base + CNTV_TVAL);
135-
break;
136128
case ARCH_TIMER_REG_CVAL:
137129
/* Same restriction as above */
138130
writeq_relaxed(val, timer->base + CNTV_CVAL_LO);

include/clocksource/arm_arch_timer.h

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
enum arch_timer_reg {
2626
ARCH_TIMER_REG_CTRL,
27-
ARCH_TIMER_REG_TVAL,
2827
ARCH_TIMER_REG_CVAL,
2928
};
3029

0 commit comments

Comments
 (0)