]> Pileus Git - ~andy/linux/commitdiff
Merge tag 'renesas-fixes4-for-v3.12' into soc2-base
authorSimon Horman <horms+renesas@verge.net.au>
Tue, 8 Oct 2013 00:44:08 +0000 (09:44 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 8 Oct 2013 00:44:08 +0000 (09:44 +0900)
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.

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

index ef3baaa79e6da28259f65c14aad218d7f5929358,5930af8d434fb90c4a79fd8b0f8c225be9b93b58..6d1026e99e1362617742a4aa5c4f4911f1baa94a
@@@ -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