diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-05-15 15:32:02 +0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 14:56:26 +0400 |
| commit | f48039a3da40f0c193122c83ad582913f2daf29d (patch) | |
| tree | 14c1e95174ef9bc57bdc7abf432532d627004bd4 /arch | |
| parent | 3e05f24aa95bb043f1103b41392b61ce83d2675e (diff) | |
| download | linux-f48039a3da40f0c193122c83ad582913f2daf29d.tar.xz | |
ARM: shmobile: r8a7779: Move r8a7779_earlytimer_init to clock-r8a7779.c
r8a7779_earlytimer_init() calls r8a7779_clock_init() and
r8a7779_clock_init() is defined in clock-r8a7779.c.
If both CONFIG_COMMON_CLK and CONFIG_ARCH_R8A7779 are enabled,
as will be the case when marzen-reference moves to use
the common clock framework, then setup-r8a7779.c is compiled
but clock-r8a7779.c is not.
As r8a7779_earlytimer_init() is not used by marzen-reference
simply move it to clock-r8a7779.c.
[horms+renesas@verge.net.au: rebase]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7779.c | 11 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7779.c | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c index 5dd66a21f036..e690927f3505 100644 --- a/arch/arm/mach-shmobile/clock-r8a7779.c +++ b/arch/arm/mach-shmobile/clock-r8a7779.c @@ -23,6 +23,7 @@ #include <linux/io.h> #include <linux/sh_clk.h> #include <linux/clkdev.h> +#include <linux/sh_timer.h> #include <mach/r8a7779.h> #include "clock.h" #include "common.h" @@ -261,3 +262,13 @@ void __init r8a7779_clock_init(void) else panic("failed to setup r8a7779 clocks\n"); } + +/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ +void __init __weak r8a7779_register_twd(void) { } + +void __init r8a7779_earlytimer_init(void) +{ + r8a7779_clock_init(); + r8a7779_register_twd(); + shmobile_earlytimer_init(); +} diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c index 25e1d0b72463..23122f62366c 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c @@ -674,16 +674,6 @@ void __init r8a7779_add_standard_devices(void) r8a7779_register_hpb_dmae(); } -/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ -void __init __weak r8a7779_register_twd(void) { } - -void __init r8a7779_earlytimer_init(void) -{ - r8a7779_clock_init(); - r8a7779_register_twd(); - shmobile_earlytimer_init(); -} - void __init r8a7779_add_early_devices(void) { early_platform_add_devices(r8a7779_devices_dt, |