diff options
| author | Magnus Damm <damm@opensource.se> | 2012-03-06 12:36:22 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-13 01:19:44 +0400 |
| commit | 9e8de440da4a6c231e3970566712149d4593831a (patch) | |
| tree | c50344d05e3dd00b1dd6d2d5c29f86ddc4ce6ff8 /arch/arm/mach-shmobile/board-g3evm.c | |
| parent | 08ad42fb7702ee2968b5b837e245ca8fd2175223 (diff) | |
| download | linux-9e8de440da4a6c231e3970566712149d4593831a.tar.xz | |
ARM: mach-shmobile: sh7367 and G3EVM timer rework
Move the SoC specific timer code from G3EVM board code
to sh7367 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-g3evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-g3evm.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mach-shmobile/board-g3evm.c b/arch/arm/mach-shmobile/board-g3evm.c index 40ddea55fa6e..b627e89037f5 100644 --- a/arch/arm/mach-shmobile/board-g3evm.c +++ b/arch/arm/mach-shmobile/board-g3evm.c @@ -37,7 +37,6 @@ #include <mach/common.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/time.h> /* * IrDA @@ -332,21 +331,11 @@ static void __init g3evm_init(void) platform_add_devices(g3evm_devices, ARRAY_SIZE(g3evm_devices)); } -static void __init g3evm_timer_init(void) -{ - sh7367_clock_init(); - shmobile_timer.init(); -} - -static struct sys_timer g3evm_timer = { - .init = g3evm_timer_init, -}; - MACHINE_START(G3EVM, "g3evm") .map_io = sh7367_map_io, .init_early = sh7367_add_early_devices, .init_irq = sh7367_init_irq, .handle_irq = shmobile_handle_irq_intc, .init_machine = g3evm_init, - .timer = &g3evm_timer, + .timer = &shmobile_timer, MACHINE_END |