| From da1efd252d3c839c3b3cf4b4bfd8332fcb1db7cc Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 1 Aug 2013 04:03:00 +0900 |
| Subject: 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> |
| |
| (cherry picked from commit c4a62a5f79f515056d9293ee0e9ce0869a326021) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/setup-r8a7790.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c |
| index 86cf507b..6d4aa041 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7790.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7790.c |
| @@ -18,6 +18,7 @@ |
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| */ |
| |
| +#include <linux/clocksource.h> |
| #include <linux/irq.h> |
| #include <linux/kernel.h> |
| #include <linux/of_platform.h> |
| @@ -263,7 +264,7 @@ void __init r8a7790_timer_init(void) |
| iounmap(base); |
| #endif /* CONFIG_ARM_ARCH_TIMER */ |
| |
| - shmobile_timer_init(); |
| + clocksource_of_init(); |
| } |
| |
| void __init r8a7790_init_delay(void) |
| -- |
| 1.8.4.3.gca3854a |
| |
