Skip to content

Commit

Permalink
[ARM] Kirkwood: fix timer initialization for LaCie boards
Browse files Browse the repository at this point in the history 
Signed-off-by: Simon Guinot <sguinot@lacie.com>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
  • Loading branch information
Simon Guinot authored and Nicolas Pitre committed Oct 21, 2010
1 parent 2fa0f93 commit d349182
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 22 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-kirkwood/d2net_v2-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,5 +227,5 @@ MACHINE_START(D2NET_V2, "LaCie d2 Network v2")
.init_machine = d2net_v2_init,
.map_io = kirkwood_map_io,
.init_irq = kirkwood_init_irq,
.timer = &lacie_v2_timer,
.timer = &kirkwood_timer,
MACHINE_END
14 changes: 0 additions & 14 deletions arch/arm/mach-kirkwood/lacie_v2-common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,3 @@ void __init lacie_v2_hdd_power_init(int hdd_num)
pr_err("Failed to power up HDD%d\n", i + 1);
}
}

/*****************************************************************************
* Timer
****************************************************************************/

static void lacie_v2_timer_init(void)
{
kirkwood_tclk = 166666667;
orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
}

struct sys_timer lacie_v2_timer = {
.init = lacie_v2_timer_init,
};
2 changes: 0 additions & 2 deletions arch/arm/mach-kirkwood/lacie_v2-common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@ void lacie_v2_register_flash(void);
void lacie_v2_register_i2c_devices(void);
void lacie_v2_hdd_power_init(int hdd_num);

extern struct sys_timer lacie_v2_timer;

#endif
6 changes: 3 additions & 3 deletions arch/arm/mach-kirkwood/netspace_v2-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ MACHINE_START(NETSPACE_V2, "LaCie Network Space v2")
.init_machine = netspace_v2_init,
.map_io = kirkwood_map_io,
.init_irq = kirkwood_init_irq,
.timer = &lacie_v2_timer,
.timer = &kirkwood_timer,
MACHINE_END
#endif

Expand All @@ -233,7 +233,7 @@ MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2")
.init_machine = netspace_v2_init,
.map_io = kirkwood_map_io,
.init_irq = kirkwood_init_irq,
.timer = &lacie_v2_timer,
.timer = &kirkwood_timer,
MACHINE_END
#endif

Expand All @@ -245,6 +245,6 @@ MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2")
.init_machine = netspace_v2_init,
.map_io = kirkwood_map_io,
.init_irq = kirkwood_init_irq,
.timer = &lacie_v2_timer,
.timer = &kirkwood_timer,
MACHINE_END
#endif
4 changes: 2 additions & 2 deletions arch/arm/mach-kirkwood/netxbig_v2-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2")
.init_machine = netxbig_v2_init,
.map_io = kirkwood_map_io,
.init_irq = kirkwood_init_irq,
.timer = &lacie_v2_timer,
.timer = &kirkwood_timer,
MACHINE_END
#endif

Expand All @@ -417,6 +417,6 @@ MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2")
.init_machine = netxbig_v2_init,
.map_io = kirkwood_map_io,
.init_irq = kirkwood_init_irq,
.timer = &lacie_v2_timer,
.timer = &kirkwood_timer,
MACHINE_END
#endif

0 comments on commit d349182

Please sign in to comment.