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

Merge "Renesas ARM Based SoC Cleanup Updates for v3.18" from Simon Horman:

* Remove Genmai board code

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'renesas-cleanup-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r7s72100: Remove legacy board support
  ARM: shmobile: r7s72100: genmai: Remove legacy board file
  ARM: shmobile: r7s72100: genmai: Remove reference board file

diff --combined arch/arm/mach-shmobile/Makefile
index a6a1dc0335aef22a68a292ef8b2087afd978f17a,c7e2ad88baa9991847d6b0bb6267c515642c2fd6..2eb2c5b02118995ff2e946c342556f96a7fc74a3
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -2,6 -2,8 +2,6 @@@
  # Makefile for the linux kernel.
  #
  
 -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
 -
  # Common objects
  obj-y                         := timer.o console.o
  
@@@ -29,7 -31,6 +29,6 @@@ obj-$(CONFIG_ARCH_R8A7778)    += clock-r8a
  obj-$(CONFIG_ARCH_R8A7779)    += clock-r8a7779.o
  obj-$(CONFIG_ARCH_R8A7790)    += clock-r8a7790.o
  obj-$(CONFIG_ARCH_R8A7791)    += clock-r8a7791.o
- obj-$(CONFIG_ARCH_R7S72100)   += clock-r7s72100.o
  endif
  
  # CPU reset vector handling objects
@@@ -61,7 -62,6 +60,6 @@@ obj-$(CONFIG_ARCH_SH7372)     += entry-intc
  
  # Board objects
  ifdef CONFIG_ARCH_SHMOBILE_MULTI
- obj-$(CONFIG_MACH_GENMAI)     += board-genmai-reference.o
  obj-$(CONFIG_MACH_KOELSCH)    += board-koelsch-reference.o
  obj-$(CONFIG_MACH_LAGER)      += board-lager-reference.o
  obj-$(CONFIG_MACH_MARZEN)     += board-marzen-reference.o
@@@ -71,7 -71,6 +69,6 @@@ obj-$(CONFIG_MACH_APE6EVM_REFERENCE)  +
  obj-$(CONFIG_MACH_MACKEREL)   += board-mackerel.o
  obj-$(CONFIG_MACH_BOCKW)      += board-bockw.o
  obj-$(CONFIG_MACH_BOCKW_REFERENCE)    += board-bockw-reference.o
- obj-$(CONFIG_MACH_GENMAI)     += board-genmai.o
  obj-$(CONFIG_MACH_MARZEN)     += board-marzen.o
  obj-$(CONFIG_MACH_LAGER)      += board-lager.o
  obj-$(CONFIG_MACH_ARMADILLO800EVA)    += board-armadillo800eva.o

diff --combined arch/arm/mach-shmobile/setup-r7s72100.c
index 46a93f73ee4a6e4c6bf0753e99bf146c299f7192,111437df8eb64728a0c7d10bd1ba733de3dda65d..4122104359f98d909ae03a923256b479972ff3e0
--- 1/arch/arm/mach-shmobile/setup-r7s72100.c
--- 2/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@@ -24,7 -24,6 +24,6 @@@
  
  #include "common.h"
  
- #ifdef CONFIG_USE_OF
  static const char *r7s72100_boards_compat_dt[] __initdata = {
        "renesas,r7s72100",
        NULL,
@@@ -32,7 -31,5 +31,6 @@@
  
  DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
        .init_early     = shmobile_init_delay,
 +      .init_late      = shmobile_init_late,
        .dt_compat      = r7s72100_boards_compat_dt,
  MACHINE_END
- #endif /* CONFIG_USE_OF */