Skip to content

Commit

Permalink
ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Laurent Pinchart authored and Simon Horman committed Dec 19, 2013
1 parent 0ef3cde commit e006502
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions arch/arm/mach-shmobile/board-koelsch-reference.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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();
Expand Down

0 comments on commit e006502

Please sign in to comment.