From: Magnus Damm <magnus.damm@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/10] ARM: shmobile: r8a7791 Arch timer workaround
Date: Tue, 01 Oct 2013 08:12:48 +0000 [thread overview]
Message-ID: <20131001081248.4136.41380.sendpatchset@w520> (raw)
In-Reply-To: <20131001081143.4136.46925.sendpatchset@w520>
From: Magnus Damm <damm@opensource.se>
Make use of the R-Car Gen2 arch timer workaround on r8a7791.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/Makefile | 2 +-
arch/arm/mach-shmobile/setup-r8a7791.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
--- 0001/arch/arm/mach-shmobile/Makefile
+++ work/arch/arm/mach-shmobile/Makefile 2013-10-01 16:32:25.000000000 +0900
@@ -16,7 +16,7 @@ obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7
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
--- 0004/arch/arm/mach-shmobile/setup-r8a7791.c
+++ work/arch/arm/mach-shmobile/setup-r8a7791.c 2013-10-01 16:34:15.000000000 +0900
@@ -27,6 +27,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) \
@@ -175,6 +176,7 @@ static const char *r8a7791_boards_compat
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 */
next prev parent reply other threads:[~2013-10-01 8:12 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-01 8:11 [PATCH 00/10] ARM: shmobile: r8a7791 SoC and Koelsch update V2 Magnus Damm
2013-10-01 8:11 ` [PATCH 01/10] ARM: shmobile: Introduce r8a7791_add_standard_devices() Magnus Damm
2013-10-03 2:36 ` Simon Horman
2013-10-01 8:12 ` [PATCH 02/10] ARM: shmobile: Use r8a7791_add_standard_devices() on Koelsch Magnus Damm
2013-10-03 4:20 ` Simon Horman
2013-10-01 8:12 ` [PATCH 03/10] ARM: shmobile: r8a7791 IRQC platform device support Magnus Damm
2013-10-03 2:37 ` Simon Horman
2013-10-01 8:12 ` [PATCH 04/10] ARM: shmobile: r8a7791 IRQC device tree node Magnus Damm
2013-10-03 2:43 ` Simon Horman
2013-10-01 8:12 ` [PATCH 05/10] ARM: shmobile: r8a7791 Arch timer " Magnus Damm
2013-10-03 2:44 ` Simon Horman
2013-10-01 8:12 ` Magnus Damm [this message]
2013-10-03 3:45 ` [PATCH 06/10] ARM: shmobile: r8a7791 Arch timer workaround Simon Horman
2013-10-01 8:12 ` [PATCH 07/10] ARM: shmobile: Use arch timer on Koelsch Magnus Damm
2013-10-03 4:21 ` Simon Horman
2013-10-01 8:13 ` [PATCH 08/10] ARM: shmobile: r8a7791 SMP device tree node Magnus Damm
2013-10-03 3:46 ` Simon Horman
2013-10-01 8:13 ` [PATCH 09/10] ARM: shmobile: r8a7791 SMP support Magnus Damm
2013-10-03 3:47 ` Simon Horman
2013-10-01 8:13 ` [PATCH 10/10] ARM: shmobile: Use SMP on Koelsch Magnus Damm
2013-10-03 4:22 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131001081248.4136.41380.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).