2c2
< * Copyright (c) 2010-2011 ARM Limited
---
> * Copyright (c) 2010-2013 ARM Limited
61d60
< localTimer[i].clock = clock;
107c106,107
< timerZeroEvent.when(), clock, timerControl.prescalar);
---
> timerZeroEvent.when(), parent->clockPeriod(),
> timerControl.prescalar);
109c109,110
< time = time / clock / power(16, timerControl.prescalar);
---
> time = time / parent->clockPeriod() /
> power(16, timerControl.prescalar);
123,124c124,127
< DPRINTF(Timer, "Event schedule for watchdog %d, clock=%d, prescale=%d\n",
< watchdogZeroEvent.when(), clock, watchdogControl.prescalar);
---
> DPRINTF(Timer,
> "Event schedule for watchdog %d, clock=%d, prescale=%d\n",
> watchdogZeroEvent.when(), parent->clockPeriod(),
> watchdogControl.prescalar);
126c129,130
< time = time / clock / power(16, watchdogControl.prescalar);
---
> time = time / parent->clockPeriod() /
> power(16, watchdogControl.prescalar);
252c256
< Tick time = clock * power(16, timerControl.prescalar);
---
> Tick time = parent->clockPeriod() * power(16, timerControl.prescalar);
270c274
< Tick time = clock * power(16, watchdogControl.prescalar);
---
> Tick time = parent->clockPeriod() * power(16, watchdogControl.prescalar);