[PATCHv4 1/2] clocksource: dw_apb_timer: Move timer defines to header file.
From: dinguyen at altera.com <hidden>
Date: 2013-09-17 22:02:40
Subsystem:
clocksource, clockevent drivers, the rest · Maintainers:
Daniel Lezcano, Thomas Gleixner, Linus Torvalds
From: Dinh Nguyen <redacted> The timer defines currently reside in dw_apb_timer.c, and dw_apb_timer_of.c needs to make use of these defines as well. Signed-off-by: Dinh Nguyen <redacted> CC: Rob Herring <redacted> CC: Arnd Bergmann <arnd@arndb.de> Cc: Olof Johansson <redacted> CC: Jamie Iles <redacted> Cc: John Stultz <redacted> Cc: Daniel Lezcano <redacted> Cc: Thomas Gleixner <redacted> Cc: Linus Walleij <redacted> Cc: Pavel Machek <redacted> Cc: Heiko Stuebner <heiko@sntech.de> Cc: linux-arm-kernel at lists.infradead.org --- v3: - Explain WHY in the changelog. v2: - Remove the defines in dw_apb_timer.c drivers/clocksource/dw_apb_timer.c | 19 ------------------- include/linux/dw_apb_timer.h | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c
index e54ca10..c3a8f52 100644
--- a/drivers/clocksource/dw_apb_timer.c
+++ b/drivers/clocksource/dw_apb_timer.c@@ -18,25 +18,6 @@ #include <linux/io.h> #include <linux/slab.h> -#define APBT_MIN_PERIOD 4 -#define APBT_MIN_DELTA_USEC 200 - -#define APBTMR_N_LOAD_COUNT 0x00 -#define APBTMR_N_CURRENT_VALUE 0x04 -#define APBTMR_N_CONTROL 0x08 -#define APBTMR_N_EOI 0x0c -#define APBTMR_N_INT_STATUS 0x10 - -#define APBTMRS_INT_STATUS 0xa0 -#define APBTMRS_EOI 0xa4 -#define APBTMRS_RAW_INT_STATUS 0xa8 -#define APBTMRS_COMP_VERSION 0xac - -#define APBTMR_CONTROL_ENABLE (1 << 0) -/* 1: periodic, 0:free running. */ -#define APBTMR_CONTROL_MODE_PERIODIC (1 << 1) -#define APBTMR_CONTROL_INT (1 << 2) - static inline struct dw_apb_clock_event_device * ced_to_dw_apb_ced(struct clock_event_device *evt) {
diff --git a/include/linux/dw_apb_timer.h b/include/linux/dw_apb_timer.h
index 1f79b20..1d2b949 100644
--- a/include/linux/dw_apb_timer.h
+++ b/include/linux/dw_apb_timer.h@@ -19,6 +19,25 @@ #define APBTMRS_REG_SIZE 0x14 +#define APBT_MIN_PERIOD 4 +#define APBT_MIN_DELTA_USEC 200 + +#define APBTMR_N_LOAD_COUNT 0x00 +#define APBTMR_N_CURRENT_VALUE 0x04 +#define APBTMR_N_CONTROL 0x08 +#define APBTMR_N_EOI 0x0c +#define APBTMR_N_INT_STATUS 0x10 + +#define APBTMRS_INT_STATUS 0xa0 +#define APBTMRS_EOI 0xa4 +#define APBTMRS_RAW_INT_STATUS 0xa8 +#define APBTMRS_COMP_VERSION 0xac + +#define APBTMR_CONTROL_ENABLE (1 << 0) +/* 1: periodic, 0:free running. */ +#define APBTMR_CONTROL_MODE_PERIODIC (1 << 1) +#define APBTMR_CONTROL_INT (1 << 2) + struct dw_apb_timer { void __iomem *base; unsigned long freq;
--
1.7.9.5