summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/board-lager.c
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2013-10-08 09:31:20 +0900
committerSimon Horman <horms+renesas@verge.net.au>2013-10-08 09:31:20 +0900
commit63862f14bdf9e1251b7398947265422ec9b1400b (patch)
treefdf5ccd215cfa23792964fbff600116788349d20 /arch/arm/mach-shmobile/board-lager.c
parentb77c6bcef2082a7cd96124daf15df8da5b670ebe (diff)
parent2349199db55bfb99e2ebdce285a7e297ba63a7ef (diff)
Merge branch 'heads/soc2' into boards2-base
Diffstat (limited to 'arch/arm/mach-shmobile/board-lager.c')
-rw-r--r--arch/arm/mach-shmobile/board-lager.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 1e231423b2b0..59951340b558 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -229,8 +229,9 @@ static const char *lager_boards_compat_dt[] __initdata = {
};
DT_MACHINE_START(LAGER_DT, "lager")
- .init_early = r8a7790_init_delay,
- .init_time = r8a7790_timer_init,
+ .smp = smp_ops(r8a7790_smp_ops),
+ .init_early = r8a7790_init_early,
+ .init_time = rcar_gen2_timer_init,
.init_machine = lager_add_standard_devices,
.dt_compat = lager_boards_compat_dt,
MACHINE_END