Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next

[mirror_ubuntu-bionic-kernel.git] / drivers / clocksource / cadence_ttc_timer.c

diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
index fbfbdec13b081837e3866ee06f8a9c231cce990c..44e5e951583bc38fc8c4a6a9b89ea91f7587af34 100644 (file)
--- a/drivers/clocksource/cadence_ttc_timer.c
+++ b/drivers/clocksource/cadence_ttc_timer.c
@@ -158,11 +158,11 @@ static irqreturn_t ttc_clock_event_interrupt(int irq, void *dev_id)
  *
  * returns: Current timer counter register value
  **/
-static cycle_t __ttc_clocksource_read(struct clocksource *cs)
+static u64 __ttc_clocksource_read(struct clocksource *cs)
 {
        struct ttc_timer *timer = &to_ttc_timer_clksrc(cs)->ttc;
 
-       return (cycle_t)readl_relaxed(timer->base_addr +
+       return (u64)readl_relaxed(timer->base_addr +
                                TTC_COUNT_VAL_OFFSET);
 }