| From 6ad4fa6b33bc5133d76c939f61166d4928e752c5 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Tue, 1 Oct 2013 17:12:48 +0900 |
| Subject: ARM: shmobile: r8a7791 Arch timer workaround |
| |
| Make use of the R-Car Gen2 arch timer workaround on r8a7791. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit ca1e6f22a0ab5ae6ec2114993a23d5814f0799c7) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/Makefile | 2 +- |
| arch/arm/mach-shmobile/setup-r8a7791.c | 2 ++ |
| 2 files changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile |
| index d1486e550eae..623fa207520b 100644 |
| --- a/arch/arm/mach-shmobile/Makefile |
| +++ b/arch/arm/mach-shmobile/Makefile |
| @@ -16,7 +16,7 @@ obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o |
| obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o |
| obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o |
| obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o setup-rcar-gen2.o |
| -obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o |
| +obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o setup-rcar-gen2.o |
| obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o |
| |
| # Clock objects |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c |
| index ba4fa3edf44f..cb3859b4cc95 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7791.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7791.c |
| @@ -28,6 +28,7 @@ |
| #include <mach/common.h> |
| #include <mach/irqs.h> |
| #include <mach/r8a7791.h> |
| +#include <mach/rcar-gen2.h> |
| #include <asm/mach/arch.h> |
| |
| #define SCIF_COMMON(scif_type, baseaddr, irq) \ |
| @@ -176,6 +177,7 @@ static const char *r8a7791_boards_compat_dt[] __initdata = { |
| |
| DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)") |
| .init_early = r8a7791_init_early, |
| + .init_time = rcar_gen2_timer_init, |
| .dt_compat = r8a7791_boards_compat_dt, |
| MACHINE_END |
| #endif /* CONFIG_USE_OF */ |
| -- |
| 1.8.5.rc3 |
| |
