Commit b4c6ed13 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'renesas-boards2-for-v3.16' of...

Merge tag 'renesas-boards2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Second Round of Renesas ARM Based SoC Boards Updates for v3.16" from
Simon Horman:

r8a7740 (R-Mobile A1) based Armadillo800 EVA board
* Minor cleanup of the Armadillo legacy board code

* tag 'renesas-boards2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Minor cleanup of the Armadillo legacy board code
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 77d563d2 fd105ecf
...@@ -1300,11 +1300,6 @@ static void __init eva_earlytimer_init(void) ...@@ -1300,11 +1300,6 @@ static void __init eva_earlytimer_init(void)
eva_clock_init(); eva_clock_init();
} }
static void __init eva_add_early_devices(void)
{
r8a7740_add_early_devices();
}
#define RESCNT2 IOMEM(0xe6188020) #define RESCNT2 IOMEM(0xe6188020)
static void eva_restart(enum reboot_mode mode, const char *cmd) static void eva_restart(enum reboot_mode mode, const char *cmd)
{ {
...@@ -1319,7 +1314,7 @@ static const char *eva_boards_compat_dt[] __initdata = { ...@@ -1319,7 +1314,7 @@ static const char *eva_boards_compat_dt[] __initdata = {
DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva")
.map_io = r8a7740_map_io, .map_io = r8a7740_map_io,
.init_early = eva_add_early_devices, .init_early = r8a7740_add_early_devices,
.init_irq = r8a7740_init_irq_of, .init_irq = r8a7740_init_irq_of,
.init_machine = eva_init, .init_machine = eva_init,
.init_late = shmobile_init_late, .init_late = shmobile_init_late,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment