diff options
author | Magnus Damm <damm@opensource.se> | 2013-07-31 15:03:00 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 05:07:12 -0400 |
commit | c4a62a5f79f515056d9293ee0e9ce0869a326021 (patch) | |
tree | 8a665a8095f7b6ec5e4ef4ced1380ca852b1da6a /arch/arm/mach-shmobile | |
parent | f6110210347fea5599223fba6ecce14f1683f510 (diff) |
ARM: shmobile: Use clocksource_of_init() on r8a7790
Replace the call to shmobile_timer_init() with
clocksource_of_init(). This will allow us to
get rid of shmobile_timer_init().
Signed-off-by: Magnus Damm <damm@opensource.se>
[horms+renesas@verge.net.au: include linux/clocksource.h]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7790.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c index 86cf507bc957..6d4aa0410750 100644 --- a/arch/arm/mach-shmobile/setup-r8a7790.c +++ b/arch/arm/mach-shmobile/setup-r8a7790.c | |||
@@ -18,6 +18,7 @@ | |||
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/clocksource.h> | ||
21 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
22 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
23 | #include <linux/of_platform.h> | 24 | #include <linux/of_platform.h> |
@@ -263,7 +264,7 @@ void __init r8a7790_timer_init(void) | |||
263 | iounmap(base); | 264 | iounmap(base); |
264 | #endif /* CONFIG_ARM_ARCH_TIMER */ | 265 | #endif /* CONFIG_ARM_ARCH_TIMER */ |
265 | 266 | ||
266 | shmobile_timer_init(); | 267 | clocksource_of_init(); |
267 | } | 268 | } |
268 | 269 | ||
269 | void __init r8a7790_init_delay(void) | 270 | void __init r8a7790_init_delay(void) |