| From b5df1d2a11d27776f061bcbd22a8da97f3222c1c Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Thu, 15 May 2014 20:32:12 +0900 |
| Subject: ARM: shmobile: marzen-reference: Remove legacy clock support |
| |
| Marzen DT 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. |
| |
| Based on similar work for the Koelsch board by Magnus Damm. |
| |
| Cc: Magnus Damm <damm@opensource.se> |
| Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit f0b78f8b63fe92242232b7a3e4aa951983ee1f45) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-marzen-reference.c | 8 -------- |
| 1 file changed, 8 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c |
| index 46936ff2627e..1b63686e0160 100644 |
| --- a/arch/arm/mach-shmobile/board-marzen-reference.c |
| +++ b/arch/arm/mach-shmobile/board-marzen-reference.c |
| @@ -31,13 +31,10 @@ |
| |
| static void __init marzen_init_timer(void) |
| { |
| -#ifdef CONFIG_COMMON_CLK |
| r8a7779_clocks_init(r8a7779_read_mode_pins()); |
| -#endif |
| clocksource_of_init(); |
| } |
| |
| -#ifdef CONFIG_COMMON_CLK |
| /* |
| * This is a really crude hack to provide clkdev support to platform |
| * devices until they get moved to DT. |
| @@ -51,15 +48,10 @@ static const struct clk_name clk_names[] __initconst = { |
| { "scif5", NULL, "sh-sci.5" }, |
| { "tmu0", "fck", "sh-tmu.0" }, |
| }; |
| -#endif |
| |
| static void __init marzen_init(void) |
| { |
| -#ifdef CONFIG_COMMON_CLK |
| shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false); |
| -#else |
| - r8a7779_clock_init(); |
| -#endif |
| r8a7779_add_standard_devices_dt(); |
| of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
| r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */ |
| -- |
| 2.1.2 |
| |
