ARM: set arch_gettimeoffset directly
remove ARM's struct sys_timer .offset function pointer, and instead directly set the arch_gettimeoffset function pointer when the timer driver is initialized. This requires multiplying all function results by 1000, since the removed arm_gettimeoffset() did this. Also, s/unsigned long/u32/ just to make the function prototypes exactly match that of arch_gettimeoffset. Cc: Russell King <linux@arm.linux.org.uk> Cc: Andrew Victor <linux@maxim.org.za> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Cc: Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ryan Mallon <rmallon@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
@@ -158,7 +158,7 @@ static void __init ebsa110_init_early(void)
|
||||
* interrupt, then the PIT counter will roll over (ie, be negative).
|
||||
* This actually works out to be convenient.
|
||||
*/
|
||||
static unsigned long ebsa110_gettimeoffset(void)
|
||||
static u32 ebsa110_gettimeoffset(void)
|
||||
{
|
||||
unsigned long offset, count;
|
||||
|
||||
@@ -181,7 +181,7 @@ static unsigned long ebsa110_gettimeoffset(void)
|
||||
*/
|
||||
offset = offset * (1000000 / HZ) / COUNT;
|
||||
|
||||
return offset;
|
||||
return offset * 1000;
|
||||
}
|
||||
|
||||
static irqreturn_t
|
||||
@@ -215,6 +215,8 @@ static struct irqaction ebsa110_timer_irq = {
|
||||
*/
|
||||
static void __init ebsa110_timer_init(void)
|
||||
{
|
||||
arch_gettimeoffset = ebsa110_gettimeoffset;
|
||||
|
||||
/*
|
||||
* Timer 1, mode 2, LSB/MSB
|
||||
*/
|
||||
@@ -227,7 +229,6 @@ static void __init ebsa110_timer_init(void)
|
||||
|
||||
static struct sys_timer ebsa110_timer = {
|
||||
.init = ebsa110_timer_init,
|
||||
.offset = ebsa110_gettimeoffset,
|
||||
};
|
||||
|
||||
static struct plat_serial8250_port serial_platform_data[] = {
|
||||
|
Reference in New Issue
Block a user