Merge tag 'renesas-cleanup-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel...

From Simon Horman:
Renesas ARM based SoC cleanups for v3.13

* Constify platform data and resources of r8a7790 SoC
* Rename to r8a7790_init_delay() as r8a7790_init_early()
  - This is in preparation for doing more than just initialising the delay
* Rename r8a73a4_init_delay() as r8a73a4_init_early()
  - This is in preparation for doing more than just initialising the delay

* tag 'renesas-cleanup-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790: Constify platform data and resources
  ARM: shmobile: Rename to r8a7790_init_early()
  ARM: shmobile: Rename to r8a73a4_init_early()

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-shmobile/board-ape6evm.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-lager.c
index 5930af8d434fb90c4a79fd8b0f8c225be9b93b58,4047fac811c0ad54e2ec7174a4dc9b64c0cf092c..6569491839cf2e099905b5bfe9c1467deb2034b5
--- 1/arch/arm/mach-shmobile/board-lager.c
--- 2/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@@ -186,8 -161,8 +186,8 @@@ static const char *lager_boards_compat_
  };
  
  DT_MACHINE_START(LAGER_DT, "lager")
-       .init_early     = r8a7790_init_delay,
+       .init_early     = r8a7790_init_early,
        .init_time      = r8a7790_timer_init,
 -      .init_machine   = lager_add_standard_devices,
 +      .init_machine   = lager_init,
        .dt_compat      = lager_boards_compat_dt,
  MACHINE_END