diff options
author | Magnus Damm <damm@opensource.se> | 2013-09-11 20:32:49 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-10-07 20:52:25 -0400 |
commit | 50c517d92eac08b352ccf4b25c93a53947bb855e (patch) | |
tree | 910deb67009ee8c630bd9d73c6c6f960a1298638 /arch/arm/mach-shmobile/board-lager-reference.c | |
parent | b9b28f5254d792d7ebe35f5314fe11a36174270d (diff) |
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>
[horms+renesas@verge.net.au trivial rebase of board-lager.c
for introduction of lager_add_standard_devices()]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/board-lager-reference.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-lager-reference.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c index d39a91b3ba48..1a1a4a888632 100644 --- a/arch/arm/mach-shmobile/board-lager-reference.c +++ b/arch/arm/mach-shmobile/board-lager-reference.c | |||
@@ -40,7 +40,7 @@ static const char *lager_boards_compat_dt[] __initdata = { | |||
40 | DT_MACHINE_START(LAGER_DT, "lager") | 40 | DT_MACHINE_START(LAGER_DT, "lager") |
41 | .smp = smp_ops(r8a7790_smp_ops), | 41 | .smp = smp_ops(r8a7790_smp_ops), |
42 | .init_early = r8a7790_init_early, | 42 | .init_early = r8a7790_init_early, |
43 | .init_time = rcar_gen2_timer_init, | ||
43 | .init_machine = lager_add_standard_devices, | 44 | .init_machine = lager_add_standard_devices, |
44 | .init_time = r8a7790_timer_init, | ||
45 | .dt_compat = lager_boards_compat_dt, | 45 | .dt_compat = lager_boards_compat_dt, |
46 | MACHINE_END | 46 | MACHINE_END |