blob: 055455c9c1551f80283f94831db242f230534245 [file] [log] [blame]
From dd8c9b74ae07db85558e533fca30f83ee5b46bbf Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Mon, 17 Feb 2014 16:21:28 +0900
Subject: ARM: shmobile: Remove Koelsch DT reference legacy clock bits
Koelsch DT reference is these days built for multiplatform
only which means that CCF comes with the package. Remove
unused legacy code ifdefs to clean up the code.
Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 34b6a241de1d965b1c047a97fad602687218a866)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-koelsch-reference.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index 267fe8358cfe..a3fd30242bd8 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -84,7 +84,6 @@ static void __init koelsch_add_du_device(void)
static void __init koelsch_add_standard_devices(void)
{
-#ifdef CONFIG_COMMON_CLK
/*
* This is a really crude hack to provide clkdev support to the CMT and
* DU devices until they get moved to DT.
@@ -125,9 +124,7 @@ static void __init koelsch_add_standard_devices(void)
clk_put(clk);
}
}
-#else
- r8a7791_clock_init();
-#endif
+
r8a7791_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
--
2.1.2