| From fa8306a4b7bbbba32d5a3b4dad36905e6a2924d9 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Fri, 16 May 2014 14:10:13 +0200 |
| Subject: ARM: shmobile: genmai-reference: Remove legacy clock support |
| |
| genmai-reference is now only built for multiplatform which means that |
| CCF comes with the package. Remove unused legacy code ifdefs to clean up |
| the code. |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 88351216f595786a24ff6cb7df7b101811981c78) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-genmai-reference.c | 6 ------ |
| 1 file changed, 6 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c |
| index 33015e5ed52a..968bbba20d08 100644 |
| --- a/arch/arm/mach-shmobile/board-genmai-reference.c |
| +++ b/arch/arm/mach-shmobile/board-genmai-reference.c |
| @@ -26,7 +26,6 @@ |
| #include <asm/mach-types.h> |
| #include <asm/mach/arch.h> |
| |
| -#ifdef CONFIG_COMMON_CLK |
| /* |
| * This is a really crude hack to provide clkdev support to platform |
| * devices until they get moved to DT. |
| @@ -34,15 +33,10 @@ |
| static const struct clk_name clk_names[] = { |
| { "mtu2", "fck", "sh-mtu2" }, |
| }; |
| -#endif |
| |
| static void __init genmai_add_standard_devices(void) |
| { |
| -#ifdef CONFIG_COMMON_CLK |
| shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), true); |
| -#else |
| - r7s72100_clock_init(); |
| -#endif |
| r7s72100_add_dt_devices(); |
| of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
| } |
| -- |
| 2.1.2 |
| |