diff options
| author | Fu Wei <fu.wei@linaro.org> | 2017-01-18 08:25:28 -0500 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2017-04-10 09:29:54 -0400 |
| commit | 831610c08e63b69b141c446c78eb9e9315660a5d (patch) | |
| tree | 94b9f1808f1a91c6273899f88585573cb2e5d26d /include/clocksource | |
| parent | ee34f1e63d3d2b8df8607847eafbc859ec6818dc (diff) | |
clocksource: arm_arch_timer: move enums and defines to header file
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>
Diffstat (limited to 'include/clocksource')
| -rw-r--r-- | include/clocksource/arm_arch_timer.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index caedb74c9210..b8986371159c 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h | |||
| @@ -16,9 +16,13 @@ | |||
| 16 | #ifndef __CLKSOURCE_ARM_ARCH_TIMER_H | 16 | #ifndef __CLKSOURCE_ARM_ARCH_TIMER_H |
| 17 | #define __CLKSOURCE_ARM_ARCH_TIMER_H | 17 | #define __CLKSOURCE_ARM_ARCH_TIMER_H |
| 18 | 18 | ||
| 19 | #include <linux/bitops.h> | ||
| 19 | #include <linux/timecounter.h> | 20 | #include <linux/timecounter.h> |
| 20 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 21 | 22 | ||
| 23 | #define ARCH_TIMER_TYPE_CP15 BIT(0) | ||
| 24 | #define ARCH_TIMER_TYPE_MEM BIT(1) | ||
| 25 | |||
| 22 | #define ARCH_TIMER_CTRL_ENABLE (1 << 0) | 26 | #define ARCH_TIMER_CTRL_ENABLE (1 << 0) |
| 23 | #define ARCH_TIMER_CTRL_IT_MASK (1 << 1) | 27 | #define ARCH_TIMER_CTRL_IT_MASK (1 << 1) |
| 24 | #define ARCH_TIMER_CTRL_IT_STAT (1 << 2) | 28 | #define ARCH_TIMER_CTRL_IT_STAT (1 << 2) |
| @@ -34,6 +38,14 @@ enum arch_timer_reg { | |||
| 34 | ARCH_TIMER_REG_TVAL, | 38 | ARCH_TIMER_REG_TVAL, |
| 35 | }; | 39 | }; |
| 36 | 40 | ||
| 41 | enum arch_timer_ppi_nr { | ||
| 42 | ARCH_TIMER_PHYS_SECURE_PPI, | ||
| 43 | ARCH_TIMER_PHYS_NONSECURE_PPI, | ||
| 44 | ARCH_TIMER_VIRT_PPI, | ||
| 45 | ARCH_TIMER_HYP_PPI, | ||
| 46 | ARCH_TIMER_MAX_TIMER_PPI | ||
| 47 | }; | ||
| 48 | |||
| 37 | #define ARCH_TIMER_PHYS_ACCESS 0 | 49 | #define ARCH_TIMER_PHYS_ACCESS 0 |
| 38 | #define ARCH_TIMER_VIRT_ACCESS 1 | 50 | #define ARCH_TIMER_VIRT_ACCESS 1 |
| 39 | #define ARCH_TIMER_MEM_PHYS_ACCESS 2 | 51 | #define ARCH_TIMER_MEM_PHYS_ACCESS 2 |
