diff options
| author | Takashi Yoshii <takasi-y@ops.dti.ne.jp> | 2013-10-08 14:34:03 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-02-04 10:17:55 +0900 |
| commit | ef5ecd1f20de2d1919714f029f5016bf6d061e66 (patch) | |
| tree | b40b0122a1f68ba7ad26b29e04541be83dc451bd | |
| parent | 094a804aa6943de0e9939e1c48341e87be93b3d2 (diff) | |
| download | linux-ef5ecd1f20de2d1919714f029f5016bf6d061e66.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/mach-shmobile/board-kzm9d-reference.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c index 054d8d5c8fc1..853003c8988a 100644 --- a/arch/arm/mach-shmobile/board-kzm9d-reference.c +++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c @@ -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); } |