| From 2ce7cca86459fb56b33451ab0a3076242c4f353a Mon Sep 17 00:00:00 2001 |
| From: Takashi Yoshii <takasi-y@ops.dti.ne.jp> |
| Date: Tue, 8 Oct 2013 14:34:03 +0900 |
| Subject: 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> |
| (cherry picked from commit ef5ecd1f20de2d1919714f029f5016bf6d061e66) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-kzm9d-reference.c | 5 ++--- |
| 1 file 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); |
| } |
| |
| -- |
| 2.1.2 |
| |