[PATCH 05/12] ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
Simon Horman
horms+renesas at verge.net.au
Tue Dec 24 09:18:09 EST 2013
From: Laurent Pinchart <laurent.pinchart+renesas at ideasonboard.com>
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 at ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas at 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 a804a17..4b48e2d 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();
--
1.8.4
More information about the linux-arm-kernel
mailing list