diff options
| author | Magnus Damm <damm@opensource.se> | 2012-03-06 08:36:29 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-12 21:19:44 (GMT) |
| commit | 03f7beeff44a5ab03bb0afa1f0522cf26a117aeb (patch) | |
| tree | a74e69b437950085e278db2f4b43477c1e39c70e /arch/arm/mach-shmobile/board-g4evm.c | |
| parent | 9e8de440da4a6c231e3970566712149d4593831a (diff) | |
| download | linux-fsl-qoriq-03f7beeff44a5ab03bb0afa1f0522cf26a117aeb.tar.xz | |
ARM: mach-shmobile: sh7377 and G4EVM timer rework
Move the SoC specific timer code from G4EVM board code
to sh7377 setup code. This makes is possible to share
the SoC specific timer code across boards and it also
removes the need for a board specific timer structure.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm/mach-shmobile/board-g4evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-g4evm.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mach-shmobile/board-g4evm.c b/arch/arm/mach-shmobile/board-g4evm.c index 4ba2a79..46d757d 100644 --- a/arch/arm/mach-shmobile/board-g4evm.c +++ b/arch/arm/mach-shmobile/board-g4evm.c @@ -38,7 +38,6 @@ #include <mach/common.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/time.h> /* * SDHI @@ -375,21 +374,11 @@ static void __init g4evm_init(void) platform_add_devices(g4evm_devices, ARRAY_SIZE(g4evm_devices)); } -static void __init g4evm_timer_init(void) -{ - sh7377_clock_init(); - shmobile_timer.init(); -} - -static struct sys_timer g4evm_timer = { - .init = g4evm_timer_init, -}; - MACHINE_START(G4EVM, "g4evm") .map_io = sh7377_map_io, .init_early = sh7377_add_early_devices, .init_irq = sh7377_init_irq, .handle_irq = shmobile_handle_irq_intc, .init_machine = g4evm_init, - .timer = &g4evm_timer, + .timer = &shmobile_timer, MACHINE_END |