clocksource: arm_arch_timer: move enums and defines to header file

BugLink: http://bugs.launchpad.net/bugs/1688114
To support the arm_arch_timer via ACPI we need to share defines and enums
between the driver and the ACPI parser code.
So we split out the relevant defines and enums into arm_arch_timer.h.

No functional change.

Signed-off-by: Fu Wei <fu.wei@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
(cherry picked from commit 831610c08e63b69b141c446c78eb9e9315660a5d)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 20cf9621631dbde5a279c6be4f37b94c58023ba6..0616b4cda066780914186cc2b6d548e1449df36e 100644 (file)
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -54,8 +54,6 @@
 #define CNTV_TVAL      0x38
 #define CNTV_CTL       0x3c
 
-#define ARCH_TIMER_TYPE_CP15           BIT(0)
-#define ARCH_TIMER_TYPE_MEM            BIT(1)
 static unsigned arch_timers_present __initdata;
 
 static void __iomem *arch_counter_base;
@@ -68,15 +66,6 @@ struct arch_timer {
 #define to_arch_timer(e) container_of(e, struct arch_timer, evt)
 
 static u32 arch_timer_rate;
-
-enum arch_timer_ppi_nr {
-       ARCH_TIMER_PHYS_SECURE_PPI,
-       ARCH_TIMER_PHYS_NONSECURE_PPI,
-       ARCH_TIMER_VIRT_PPI,
-       ARCH_TIMER_HYP_PPI,
-       ARCH_TIMER_MAX_TIMER_PPI
-};
-
 static int arch_timer_ppi[ARCH_TIMER_MAX_TIMER_PPI];
 
 static struct clock_event_device __percpu *arch_timer_evt;

diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h
index caedb74c92108188e57652b56a1c198f3263c092..b8986371159cb0110d9cca96a91a3b437627e428 100644 (file)
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -16,9 +16,13 @@
 #ifndef __CLKSOURCE_ARM_ARCH_TIMER_H
 #define __CLKSOURCE_ARM_ARCH_TIMER_H
 
+#include <linux/bitops.h>
 #include <linux/timecounter.h>
 #include <linux/types.h>
 
+#define ARCH_TIMER_TYPE_CP15           BIT(0)
+#define ARCH_TIMER_TYPE_MEM            BIT(1)
+
 #define ARCH_TIMER_CTRL_ENABLE         (1 << 0)
 #define ARCH_TIMER_CTRL_IT_MASK                (1 << 1)
 #define ARCH_TIMER_CTRL_IT_STAT                (1 << 2)
@@ -34,6 +38,14 @@ enum arch_timer_reg {
        ARCH_TIMER_REG_TVAL,
 };
 
+enum arch_timer_ppi_nr {
+       ARCH_TIMER_PHYS_SECURE_PPI,
+       ARCH_TIMER_PHYS_NONSECURE_PPI,
+       ARCH_TIMER_VIRT_PPI,
+       ARCH_TIMER_HYP_PPI,
+       ARCH_TIMER_MAX_TIMER_PPI
+};
+
 #define ARCH_TIMER_PHYS_ACCESS         0
 #define ARCH_TIMER_VIRT_ACCESS         1
 #define ARCH_TIMER_MEM_PHYS_ACCESS     2