mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
58100c34f7
In drivers/clocksource/, 3 drivers use "TIMER_CTRL_IE" with 3 different
values. Two of them (mps2-timer.c and timer-sp804.c/timer-sp.h) are
localized and left unmodifed.
One of them uses a shared header file (<soc/arc/timers.h>), which is
what is causing the "redefined" warnings, so change the macro name in
that driver only. Also change the TIMER_CTRL_NH macro name.
Both macro names are prefixed with "ARC_" to reduce the likelihood
of future name collisions.
In file included from ../drivers/clocksource/timer-sp804.c:24:
../drivers/clocksource/timer-sp.h:25: error: "TIMER_CTRL_IE" redefined [-Werror]
25 | #define TIMER_CTRL_IE (1 << 5) /* VR */
../include/soc/arc/timers.h:20: note: this is the location of the previous definition
20 | #define TIMER_CTRL_IE (1 << 0) /* Interrupt when Count reaches limit */
Fixes: b26c2e3823 ("ARC: breakout timer include code into separate header")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: linux-snps-arc@lists.infradead.org
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Shahab Vahedi <Shahab.Vahedi@synopsys.com>
Acked-by: Vineet Gupta <vgupta@kernel.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210924020825.20317-1-rdunlap@infradead.org
35 lines
992 B
C
35 lines
992 B
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (C) 2016-17 Synopsys, Inc. (www.synopsys.com)
|
|
*/
|
|
|
|
#ifndef __SOC_ARC_TIMERS_H
|
|
#define __SOC_ARC_TIMERS_H
|
|
|
|
#include <soc/arc/aux.h>
|
|
|
|
/* Timer related Aux registers */
|
|
#define ARC_REG_TIMER0_LIMIT 0x23 /* timer 0 limit */
|
|
#define ARC_REG_TIMER0_CTRL 0x22 /* timer 0 control */
|
|
#define ARC_REG_TIMER0_CNT 0x21 /* timer 0 count */
|
|
#define ARC_REG_TIMER1_LIMIT 0x102 /* timer 1 limit */
|
|
#define ARC_REG_TIMER1_CTRL 0x101 /* timer 1 control */
|
|
#define ARC_REG_TIMER1_CNT 0x100 /* timer 1 count */
|
|
|
|
/* CTRL reg bits */
|
|
#define ARC_TIMER_CTRL_IE (1 << 0) /* Interrupt when Count reaches limit */
|
|
#define ARC_TIMER_CTRL_NH (1 << 1) /* Count only when CPU NOT halted */
|
|
|
|
#define ARC_TIMERN_MAX 0xFFFFFFFF
|
|
|
|
#define ARC_REG_TIMERS_BCR 0x75
|
|
|
|
struct bcr_timer {
|
|
#ifdef CONFIG_CPU_BIG_ENDIAN
|
|
unsigned int pad2:15, rtsc:1, pad1:5, rtc:1, t1:1, t0:1, ver:8;
|
|
#else
|
|
unsigned int ver:8, t0:1, t1:1, rtc:1, pad1:5, rtsc:1, pad2:15;
|
|
#endif
|
|
};
|
|
|
|
#endif
|