diff options
-rw-r--r-- | drivers/clocksource/timer-fttmr010.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c index 009370460f23..66dd909960c6 100644 --- a/drivers/clocksource/timer-fttmr010.c +++ b/drivers/clocksource/timer-fttmr010.c | |||
@@ -98,30 +98,26 @@ static inline struct fttmr010 *to_fttmr010(struct clock_event_device *evt) | |||
98 | return container_of(evt, struct fttmr010, clkevt); | 98 | return container_of(evt, struct fttmr010, clkevt); |
99 | } | 99 | } |
100 | 100 | ||
101 | static u64 notrace fttmr010_read_sched_clock_up(void) | 101 | static unsigned long fttmr010_read_current_timer_up(void) |
102 | { | 102 | { |
103 | return readl(local_fttmr->base + TIMER2_COUNT); | 103 | return readl(local_fttmr->base + TIMER2_COUNT); |
104 | } | 104 | } |
105 | 105 | ||
106 | static u64 notrace fttmr010_read_sched_clock_down(void) | 106 | static unsigned long fttmr010_read_current_timer_down(void) |
107 | { | 107 | { |
108 | return ~readl(local_fttmr->base + TIMER2_COUNT); | 108 | return ~readl(local_fttmr->base + TIMER2_COUNT); |
109 | } | 109 | } |
110 | 110 | ||
111 | #ifdef CONFIG_ARM | 111 | static u64 notrace fttmr010_read_sched_clock_up(void) |
112 | |||
113 | static unsigned long fttmr010_read_current_timer_up(void) | ||
114 | { | 112 | { |
115 | return readl(local_fttmr->base + TIMER2_COUNT); | 113 | return fttmr010_read_current_timer_up(); |
116 | } | 114 | } |
117 | 115 | ||
118 | static unsigned long fttmr010_read_current_timer_down(void) | 116 | static u64 notrace fttmr010_read_sched_clock_down(void) |
119 | { | 117 | { |
120 | return ~readl(local_fttmr->base + TIMER2_COUNT); | 118 | return fttmr010_read_current_timer_down(); |
121 | } | 119 | } |
122 | 120 | ||
123 | #endif | ||
124 | |||
125 | static int fttmr010_timer_set_next_event(unsigned long cycles, | 121 | static int fttmr010_timer_set_next_event(unsigned long cycles, |
126 | struct clock_event_device *evt) | 122 | struct clock_event_device *evt) |
127 | { | 123 | { |