summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-lager.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-09-12 09:32:49 +0900
committerSimon Horman <horms+renesas@verge.net.au>2013-10-08 09:29:15 +0900
commit629cc70ddac35520688b3a8bd165435c886e78eb (patch)
tree1f2767b7faad7efc5232e67b2e1057d08a527f59 /arch/arm/mach-shmobile/board-lager.c
parent8ceea7bd9757cb90f63f16b07a6d2a022e9c45d8 (diff)
downloadlinux-629cc70ddac35520688b3a8bd165435c886e78eb.tar.bz2
ARM: shmobile: Break out R-Car Gen2 setup code
Move arch timer workaround code and boot mode pin handling from setup-r8a7790.c to setup-rcar-gen2.c. With this in place the same code can be used on other R-Car Generation 2 devices such as r8a7791. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/board-lager.c')
-rw-r--r--arch/arm/mach-shmobile/board-lager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index ef3baaa79e6d..230bc9d67852 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -163,7 +163,7 @@ static const char *lager_boards_compat_dt[] __initdata = {
DT_MACHINE_START(LAGER_DT, "lager")
.smp = smp_ops(r8a7790_smp_ops),
.init_early = r8a7790_init_early,
- .init_time = r8a7790_timer_init,
+ .init_time = rcar_gen2_timer_init,
.init_machine = lager_add_standard_devices,
.dt_compat = lager_boards_compat_dt,
MACHINE_END