ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Wed, 11 Dec 2013 14:13:53 +0000 (15:13 +0100)
committerSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 10:08:25 +0000 (19:08 +0900)
The common clock framework is initialized in the rcar_gen2_init_timer()
function, remove the of_clk_init() call.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/board-koelsch-reference.c

index a804a17..4b48e2d 100644 (file)
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <linux/clk-provider.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <mach/common.h>
@@ -29,9 +28,7 @@
 
 static void __init koelsch_add_standard_devices(void)
 {
-#ifdef CONFIG_COMMON_CLK
-       of_clk_init(NULL);
-#else
+#ifndef CONFIG_COMMON_CLK
        r8a7791_clock_init();
 #endif
        r8a7791_add_dt_devices();