Commit 41f8d02a authored by Marc Zyngier's avatar Marc Zyngier Committed by Daniel Lezcano
Browse files

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: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211017124225.3018098-11-maz@kernel.org


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 012f1885

drivers/clocksource/arm_arch_timer.c

+0 −8
Original line number Diff line number Diff line
@@ -48,10 +48,8 @@ 
#define CNTPCT_LO	0x08

#define CNTFRQ		0x10

#define CNTP_CVAL_LO	0x20

#define CNTP_TVAL	0x28

#define CNTP_CTL	0x2c

#define CNTV_CVAL_LO	0x30

#define CNTV_TVAL	0x38

#define CNTV_CTL	0x3c



static unsigned arch_timers_present __initdata;
@@ -111,9 +109,6 @@ void arch_timer_reg_write(int access, enum arch_timer_reg reg, u64 val, 
		case ARCH_TIMER_REG_CTRL:

			writel_relaxed((u32)val, timer->base + CNTP_CTL);

			break;

		case ARCH_TIMER_REG_TVAL:

			writel_relaxed((u32)val, timer->base + CNTP_TVAL);

			break;

		case ARCH_TIMER_REG_CVAL:

			/*

			 * 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, 
		case ARCH_TIMER_REG_CTRL:

			writel_relaxed((u32)val, timer->base + CNTV_CTL);

			break;

		case ARCH_TIMER_REG_TVAL:

			writel_relaxed((u32)val, timer->base + CNTV_TVAL);

			break;

		case ARCH_TIMER_REG_CVAL:

			/* Same restriction as above */

			writeq_relaxed(val, timer->base + CNTV_CVAL_LO);

include/clocksource/arm_arch_timer.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 


enum arch_timer_reg {

	ARCH_TIMER_REG_CTRL,

	ARCH_TIMER_REG_TVAL,

	ARCH_TIMER_REG_CVAL,

};