diff options
Diffstat (limited to 'arch/arm/mach-shmobile/board-genmai-reference.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-genmai-reference.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c index 7630c1053e32..2ff6ad6e608e 100644 --- a/arch/arm/mach-shmobile/board-genmai-reference.c +++ b/arch/arm/mach-shmobile/board-genmai-reference.c | |||
@@ -18,27 +18,31 @@ | |||
18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/clk-provider.h> | ||
22 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
23 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
23 | #include <mach/clock.h> | ||
24 | #include <mach/common.h> | 24 | #include <mach/common.h> |
25 | #include <mach/r7s72100.h> | 25 | #include <mach/r7s72100.h> |
26 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
27 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
28 | 28 | ||
29 | /* | ||
30 | * This is a really crude hack to provide clkdev support to platform | ||
31 | * devices until they get moved to DT. | ||
32 | */ | ||
33 | static const struct clk_name clk_names[] = { | ||
34 | { "mtu2", "fck", "sh-mtu2" }, | ||
35 | }; | ||
36 | |||
29 | static void __init genmai_add_standard_devices(void) | 37 | static void __init genmai_add_standard_devices(void) |
30 | { | 38 | { |
31 | #ifdef CONFIG_COMMON_CLK | 39 | shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), true); |
32 | of_clk_init(NULL); | ||
33 | #else | ||
34 | r7s72100_clock_init(); | ||
35 | #endif | ||
36 | r7s72100_add_dt_devices(); | 40 | r7s72100_add_dt_devices(); |
37 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 41 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
38 | } | 42 | } |
39 | 43 | ||
40 | static const char * const genmai_boards_compat_dt[] __initconst = { | 44 | static const char * const genmai_boards_compat_dt[] __initconst = { |
41 | "renesas,genmai-reference", | 45 | "renesas,genmai", |
42 | NULL, | 46 | NULL, |
43 | }; | 47 | }; |
44 | 48 | ||