summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-12-11 15:13:53 +0100
committerSimon Horman <horms+renesas@verge.net.au>2013-12-19 19:08:25 +0900
commite006502126a6a1f3afd879afa9101cc3df8b11f9 (patch)
tree0f00cbbf8cecb03895e228e31b01a04fb1194924 /arch/arm/mach-shmobile
parent0ef3cde4d906041a497bfc585568a45ae84b4a8f (diff)
downloadlinux-stable-e006502126a6a1f3afd879afa9101cc3df8b11f9.tar.gz
linux-stable-e006502126a6a1f3afd879afa9101cc3df8b11f9.tar.bz2
linux-stable-e006502126a6a1f3afd879afa9101cc3df8b11f9.zip
ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
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>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/board-koelsch-reference.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index a804a1798a71..4b48e2d4dec4 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -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();