diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-12-11 09:13:53 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 05:08:25 -0500 |
commit | e006502126a6a1f3afd879afa9101cc3df8b11f9 (patch) | |
tree | 0f00cbbf8cecb03895e228e31b01a04fb1194924 | |
parent | 0ef3cde4d906041a497bfc585568a45ae84b4a8f (diff) |
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>
-rw-r--r-- | arch/arm/mach-shmobile/board-koelsch-reference.c | 5 |
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 @@ | |||
19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/clk-provider.h> | ||
23 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
24 | #include <linux/of_platform.h> | 23 | #include <linux/of_platform.h> |
25 | #include <mach/common.h> | 24 | #include <mach/common.h> |
@@ -29,9 +28,7 @@ | |||
29 | 28 | ||
30 | static void __init koelsch_add_standard_devices(void) | 29 | static void __init koelsch_add_standard_devices(void) |
31 | { | 30 | { |
32 | #ifdef CONFIG_COMMON_CLK | 31 | #ifndef CONFIG_COMMON_CLK |
33 | of_clk_init(NULL); | ||
34 | #else | ||
35 | r8a7791_clock_init(); | 32 | r8a7791_clock_init(); |
36 | #endif | 33 | #endif |
37 | r8a7791_add_dt_devices(); | 34 | r8a7791_add_dt_devices(); |