3 files changed, 1 insertions, 9 deletions

diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 41c808e56005..2a05c02bec39 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -92,7 +92,6 @@ static void __init lager_add_du_device(void)
  * devices until they get moved to DT.
  */
 static const struct clk_name clk_names[] __initconst = {
-        { "cmt0", "fck", "sh-cmt-48-gen2.0" },
         { "du0", "du.0", "rcar-du-r8a7790" },
         { "du1", "du.1", "rcar-du-r8a7790" },
         { "du2", "du.2", "rcar-du-r8a7790" },
@@ -103,7 +102,6 @@ static const struct clk_name clk_names[] __initconst = {
 static void __init lager_add_standard_devices(void)
 {
         shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
-        r8a7790_add_dt_devices();
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
         lager_add_du_device();
diff --git a/arch/arm/mach-shmobile/r8a7790.h b/arch/arm/mach-shmobile/r8a7790.h
index 459827f1369b..388f0514d931 100644
--- a/arch/arm/mach-shmobile/r8a7790.h
+++ b/arch/arm/mach-shmobile/r8a7790.h
@@ -27,7 +27,6 @@ enum {
 };
 
 void r8a7790_add_standard_devices(void);
-void r8a7790_add_dt_devices(void);
 void r8a7790_clock_init(void);
 void r8a7790_pinmux_init(void);
 void r8a7790_pm_init(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 0c12b01bb9e3..877fdeb985d0 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -282,11 +282,6 @@ static struct resource cmt0_resources[] = {
                                           &cmt##idx##_platform_data,    \
                                           sizeof(struct sh_timer_config))
 
-void __init r8a7790_add_dt_devices(void)
-{
-        r8a7790_register_cmt(0);
-}
-
 void __init r8a7790_add_standard_devices(void)
 {
         r8a7790_register_scif(0);
@@ -299,7 +294,7 @@ void __init r8a7790_add_standard_devices(void)
         r8a7790_register_scif(7);
         r8a7790_register_scif(8);
         r8a7790_register_scif(9);
-        r8a7790_add_dt_devices();
+        r8a7790_register_cmt(0);
         r8a7790_register_irqc(0);
         r8a7790_register_thermal();
         r8a7790_register_i2c(0);