|
@@ -100,7 +100,7 @@ struct sh_cmt_channel {
|
|
|
raw_spinlock_t lock;
|
|
|
struct clock_event_device ced;
|
|
|
struct clocksource cs;
|
|
|
- unsigned long total_cycles;
|
|
|
+ u64 total_cycles;
|
|
|
bool cs_enabled;
|
|
|
};
|
|
|
|
|
@@ -605,8 +605,8 @@ static u64 sh_cmt_clocksource_read(struct clocksource *cs)
|
|
|
{
|
|
|
struct sh_cmt_channel *ch = cs_to_sh_cmt(cs);
|
|
|
unsigned long flags;
|
|
|
- unsigned long value;
|
|
|
u32 has_wrapped;
|
|
|
+ u64 value;
|
|
|
u32 raw;
|
|
|
|
|
|
raw_spin_lock_irqsave(&ch->lock, flags);
|
|
@@ -680,7 +680,7 @@ static int sh_cmt_register_clocksource(struct sh_cmt_channel *ch,
|
|
|
cs->disable = sh_cmt_clocksource_disable;
|
|
|
cs->suspend = sh_cmt_clocksource_suspend;
|
|
|
cs->resume = sh_cmt_clocksource_resume;
|
|
|
- cs->mask = CLOCKSOURCE_MASK(sizeof(unsigned long) * 8);
|
|
|
+ cs->mask = CLOCKSOURCE_MASK(sizeof(u64) * 8);
|
|
|
cs->flags = CLOCK_SOURCE_IS_CONTINUOUS;
|
|
|
|
|
|
dev_info(&ch->cmt->pdev->dev, "ch%u: used as clock source\n",
|