ARM: shmobile: genmai-reference: Enable MTU2 in device tree

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-shmobile / board-genmai-reference.c

diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index 2ff6ad6e608edff34c9b98c6883f451eb4e7afec..bc52677986c3c0ebb21de4dbc401065d3ddcfdcf 100644 (file)
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -19,27 +19,10 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/of_platform.h>
-#include <mach/clock.h>
-#include <mach/common.h>
-#include <mach/r7s72100.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
 
-/*
- * This is a really crude hack to provide clkdev support to platform
- * devices until they get moved to DT.
- */
-static const struct clk_name clk_names[] = {
-       { "mtu2", "fck", "sh-mtu2" },
-};
+#include <asm/mach/arch.h>
 
-static void __init genmai_add_standard_devices(void)
-{
-       shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), true);
-       r7s72100_add_dt_devices();
-       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
+#include "common.h"
 
 static const char * const genmai_boards_compat_dt[] __initconst = {
        "renesas,genmai",
@@ -47,7 +30,6 @@ static const char * const genmai_boards_compat_dt[] __initconst = {
 };
 
 DT_MACHINE_START(GENMAI_DT, "genmai")
-       .init_early     = r7s72100_init_early,
-       .init_machine   = genmai_add_standard_devices,
+       .init_early     = shmobile_init_delay,
        .dt_compat      = genmai_boards_compat_dt,
 MACHINE_END