Commit ef5ecd1f authored Oct 08, 2013 by Takashi Yoshii Committed by Simon Horman Feb 04, 2014

ARM: shmobile: kzm9d: Use common clock framework



Use common clock framework version of clock
 drivers/clk/shmobile/clk-emev2.c
instead of sh-clkfwk version
 arch/arm/mach-shmobile/clock-emev2.c
when it is configured as a part of multi-platform.

Signed-off-by: Takashi Yoshii <takasi-y@ops.dti.ne.jp>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

parent 094a804a

arch/arm/mach-shmobile/board-kzm9d-reference.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -20,15 +20,14 @@

		#include <linux/init.h>
		#include <linux/of_platform.h>
		#include <linux/clk-provider.h>
		#include <mach/emev2.h>
		#include <mach/common.h>
		#include <asm/mach/arch.h>

		static void __init kzm9d_add_standard_devices(void)
		{
		if (!IS_ENABLED(CONFIG_COMMON_CLK))
		emev2_clock_init();

		of_clk_init(NULL);
		of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
		}