diff options
Diffstat (limited to 'drivers/clocksource/arc_timer.c')
-rw-r--r-- | drivers/clocksource/arc_timer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clocksource/arc_timer.c b/drivers/clocksource/arc_timer.c index a49748d826c0..3ea46343024f 100644 --- a/drivers/clocksource/arc_timer.c +++ b/drivers/clocksource/arc_timer.c | |||
@@ -56,7 +56,7 @@ static int noinline arc_get_timer_clk(struct device_node *node) | |||
56 | 56 | ||
57 | #ifdef CONFIG_ARC_TIMERS_64BIT | 57 | #ifdef CONFIG_ARC_TIMERS_64BIT |
58 | 58 | ||
59 | static cycle_t arc_read_gfrc(struct clocksource *cs) | 59 | static u64 arc_read_gfrc(struct clocksource *cs) |
60 | { | 60 | { |
61 | unsigned long flags; | 61 | unsigned long flags; |
62 | u32 l, h; | 62 | u32 l, h; |
@@ -71,7 +71,7 @@ static cycle_t arc_read_gfrc(struct clocksource *cs) | |||
71 | 71 | ||
72 | local_irq_restore(flags); | 72 | local_irq_restore(flags); |
73 | 73 | ||
74 | return (((cycle_t)h) << 32) | l; | 74 | return (((u64)h) << 32) | l; |
75 | } | 75 | } |
76 | 76 | ||
77 | static struct clocksource arc_counter_gfrc = { | 77 | static struct clocksource arc_counter_gfrc = { |
@@ -105,7 +105,7 @@ CLOCKSOURCE_OF_DECLARE(arc_gfrc, "snps,archs-timer-gfrc", arc_cs_setup_gfrc); | |||
105 | #define AUX_RTC_LOW 0x104 | 105 | #define AUX_RTC_LOW 0x104 |
106 | #define AUX_RTC_HIGH 0x105 | 106 | #define AUX_RTC_HIGH 0x105 |
107 | 107 | ||
108 | static cycle_t arc_read_rtc(struct clocksource *cs) | 108 | static u64 arc_read_rtc(struct clocksource *cs) |
109 | { | 109 | { |
110 | unsigned long status; | 110 | unsigned long status; |
111 | u32 l, h; | 111 | u32 l, h; |
@@ -122,7 +122,7 @@ static cycle_t arc_read_rtc(struct clocksource *cs) | |||
122 | status = read_aux_reg(AUX_RTC_CTRL); | 122 | status = read_aux_reg(AUX_RTC_CTRL); |
123 | } while (!(status & _BITUL(31))); | 123 | } while (!(status & _BITUL(31))); |
124 | 124 | ||
125 | return (((cycle_t)h) << 32) | l; | 125 | return (((u64)h) << 32) | l; |
126 | } | 126 | } |
127 | 127 | ||
128 | static struct clocksource arc_counter_rtc = { | 128 | static struct clocksource arc_counter_rtc = { |
@@ -166,9 +166,9 @@ CLOCKSOURCE_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc); | |||
166 | * 32bit TIMER1 to keep counting monotonically and wraparound | 166 | * 32bit TIMER1 to keep counting monotonically and wraparound |
167 | */ | 167 | */ |
168 | 168 | ||
169 | static cycle_t arc_read_timer1(struct clocksource *cs) | 169 | static u64 arc_read_timer1(struct clocksource *cs) |
170 | { | 170 | { |
171 | return (cycle_t) read_aux_reg(ARC_REG_TIMER1_CNT); | 171 | return (u64) read_aux_reg(ARC_REG_TIMER1_CNT); |
172 | } | 172 | } |
173 | 173 | ||
174 | static struct clocksource arc_counter_timer1 = { | 174 | static struct clocksource arc_counter_timer1 = { |