From: Simon Horman <horms+renesas@verge.net.au>
Date: Mon, 30 Sep 2013 07:23:53 +0000 (+0900)
Subject: Merge tag 'renesas-cleanup-for-v3.13' into next
X-Git-Tag: next-20131017~7^2~18
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=024bb0515ffde77260c02ef01085cb15eab93cb7;p=karo-tx-linux.git

Merge tag 'renesas-cleanup-for-v3.13' into next

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
---

024bb0515ffde77260c02ef01085cb15eab93cb7
diff --cc arch/arm/mach-shmobile/board-lager.c
index 5930af8d434f,4047fac811c0..6569491839cf
--- a/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