diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-10-08 02:31:20 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-10-08 02:31:20 +0200 |
| commit | 63862f14bdf9e1251b7398947265422ec9b1400b (patch) | |
| tree | fdf5ccd215cfa23792964fbff600116788349d20 /arch/arm/mach-shmobile/board-lager.c | |
| parent | ARM: shmobile: lager: disable MMCIF Command Completion Signal, add CLK_CTRL2 (diff) | |
| parent | ARM: shmobile: r8a7791 SMP support (diff) | |
| download | linux-63862f14bdf9e1251b7398947265422ec9b1400b.tar.xz linux-63862f14bdf9e1251b7398947265422ec9b1400b.zip | |
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.c | 5 |
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 |