Renesas ARM based SoC lager board updates for v3.10

* Use r8a7790 timer setup code to force the
   arch timer to be enabled regardless of the bootloader setting
   - This is necessary for the lager board to boot
 
 This pull request is based on:
 git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards3-for-v3.10
 git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-r8a7790-for-v3.10
 
 The merge was made to provide the r8a7790 timer setup code
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJRZm1XAAoJENfPZGlqN0++ef0QAIFBOCTdU7IhHWQ1IPmq50bo
 V+OEnlZ/FBD8s9ZmFEzS32HFbYvnsXa/fW7FNqx+Cocj2eRDx+els/kKU5oq9ZRn
 jUnFU2fWF/WoLwQmkD+88yYAt6muVL+RxP1k4nfT2Zi8yaj0IrHWHUDF7YZDLygy
 6QiVVxaDfArQNlxytK7VqJWQM+iaMJr+eT5i7u351pNQofaBHWRujFgohTv4of51
 lcy+ign3iDASsoxo09biw8uqCAsNd0WklqljrBL0E0ag88MFfBUTuKSTMZPSUtM1
 ZeTPBAz9faQdtvBWylcHuQ9+PStLl35J6nUfv0r/N7ehoslaCUDamFsTrJhNfB1S
 sjhoPXHTWHuM+dAfl+xoT1jTsgJIfilzX0QJy3/6YShUXULquznlBRA6RiXzxtJD
 SsPqJ+C0EeDoci5WOTnDbKGbLObnaP1hsHRyUb3rZM7M2VNuIkuM0G/KGae5zg8w
 l9806XCM6Ak7qIBBIoq3vVk8+FJSfCV376uZVNwoO6kCidFi9PDo6DTJq+zhs5/3
 H4FY4bhLF7WzKNHyfwbyiHbnkacu14mFxYrq3mo5wOhB42dtUnoQvNVo807tM79t
 sOc8L2m4Y3gMJ1H10FsvmGiyhuUVOrVYq2trvDc6mDD85srVdzPOyT/DnrKvvzjN
 qM8mQphgaA2FfnLGYqwB
 =7y6e
 -----END PGP SIGNATURE-----

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

From Simon Horman:
Renesas ARM based SoC lager board updates for v3.10

* Use r8a7790 timer setup code to force the
  arch timer to be enabled regardless of the bootloader setting
  - This is necessary for the lager board to boot

This pull request is based on:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards3-for-v3.10
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-r8a7790-for-v3.10

The merge was made to provide the r8a7790 timer setup code

* tag 'renesas-boards-lager-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: use r8a7790 timer setup code on Lager
  ARM: shmobile: force enable of r8a7790 arch timer
  ARM: shmobile: Add second I/O range for r8a7790 PFC

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

arch/arm/mach-shmobile/board-lager.c

@@ -40,7 +40,7 @@ static const char *lager_boards_compat_dt[] __initdata = {
 
 DT_MACHINE_START(LAGER_DT, "lager")
 	.init_irq	= irqchip_init,
-	.init_time	= shmobile_timer_init,
+	.init_time	= r8a7790_timer_init,
 	.init_machine	= lager_add_standard_devices,
 	.dt_compat	= lager_boards_compat_dt,
 MACHINE_END

arch/arm/mach-shmobile/include/mach/r8a7790.h

@@ -4,5 +4,6 @@
 void r8a7790_add_standard_devices(void);
 void r8a7790_clock_init(void);
 void r8a7790_pinmux_init(void);
+void r8a7790_timer_init(void);
 
 #endif /* __ASM_R8A7790_H__ */

arch/arm/mach-shmobile/setup-r8a7790.c

@@ -31,6 +31,7 @@
 
 static const struct resource pfc_resources[] = {
 	DEFINE_RES_MEM(0xe6060000, 0x250),
+	DEFINE_RES_MEM(0xe6050000, 0x5050),
 };
 
 void __init r8a7790_pinmux_init(void)
@@ -117,6 +118,18 @@ void __init r8a7790_add_standard_devices(void)
 	r8a7790_register_irqc(0);
 }
 
+void __init r8a7790_timer_init(void)
+{
+	void __iomem *cntcr;
+
+	/* make sure arch timer is started by setting bit 0 of CNTCT */
+	cntcr = ioremap(0xe6080000, PAGE_SIZE);
+	iowrite32(1, cntcr);
+	iounmap(cntcr);
+
+	shmobile_timer_init();
+}
+
 #ifdef CONFIG_USE_OF
 void __init r8a7790_add_standard_devices_dt(void)
 {
@@ -131,7 +144,7 @@ static const char *r8a7790_boards_compat_dt[] __initdata = {
 DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
 	.init_irq	= irqchip_init,
 	.init_machine	= r8a7790_add_standard_devices_dt,
-	.init_time	= shmobile_timer_init,
+	.init_time	= r8a7790_timer_init,
 	.dt_compat	= r8a7790_boards_compat_dt,
 MACHINE_END
 #endif /* CONFIG_USE_OF */