]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
clocksource/drivers/arm_arch_timer: Remove any trace of the TVAL programming interface
authorMarc Zyngier <maz@kernel.org>
Sun, 17 Oct 2021 12:42:18 +0000 (13:42 +0100)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Sun, 17 Oct 2021 19:47:39 +0000 (21:47 +0200)
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>
drivers/clocksource/arm_arch_timer.c
include/clocksource/arm_arch_timer.h

index ef3f83865dcd3377d06172c10825f21e400716e7..6e20bc12dc35ea5a2df8c8545d0287f4272cf36b 100644 (file)
 #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);
index d59537afb29dfb5ce86f865e89e7bd968a5c18ac..e715bdb720d51c125e874e24e2b0cb41f41a93ca 100644 (file)
@@ -24,7 +24,6 @@
 
 enum arch_timer_reg {
        ARCH_TIMER_REG_CTRL,
-       ARCH_TIMER_REG_TVAL,
        ARCH_TIMER_REG_CVAL,
 };