From: Simon Horman <horms+renesas@verge.net.au>
Date: Tue, 8 Oct 2013 00:44:08 +0000 (+0900)
Subject: Merge tag 'renesas-fixes4-for-v3.12' into soc2-base
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=243b6db0588b1425cb020e764475e8e1c4eb40d9;p=linux-beck.git

Merge tag 'renesas-fixes4-for-v3.12' into soc2-base

Fourth Round of Renesas ARM based SoC fixes for v3.12

* Remove unused #gpio-ranges-cells DT property

* Remove usage of deprecated #gpio-range-cells DT property
  from GPIO R-Car

  Property was deprecated in v3.11-rc2

* Correct ether pinctl naming for armadillo800eva board

  Regression introduced in v3.10-rc5

* Add Micrel KSZ8041 PHY fixup to lager board

  This resolves a problem that has been present since 3.11-rc2

* Update SDHI DT compatibility string to the <unit>-<soc> format

  This makes compatibility strings consistent across all renesas
  hardware which currently supports DT.

  The bindings which are being updated where intorodiced on
  a per-SoC basis starting in v3.8-rc7. They may have
  been internally consistent when originally added.
---

243b6db0588b1425cb020e764475e8e1c4eb40d9
diff --cc arch/arm/mach-shmobile/board-lager.c
index ef3baaa79e6d,5930af8d434f..6d1026e99e13
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@@ -161,9 -186,8 +186,9 @@@ static const char *lager_boards_compat_
  };
  
  DT_MACHINE_START(LAGER_DT, "lager")
 -	.init_early	= r8a7790_init_delay,
 +	.smp		= smp_ops(r8a7790_smp_ops),
 +	.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