From patchwork Tue Oct 1 08:12:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2968901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8D6AB9F289 for ; Tue, 1 Oct 2013 08:48:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1F12203AF for ; Tue, 1 Oct 2013 08:48:27 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BC7FD201B9 for ; Tue, 1 Oct 2013 08:48:26 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQv5I-0002yw-Tl; Tue, 01 Oct 2013 08:13:35 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQv4c-0002mA-BQ; Tue, 01 Oct 2013 08:12:50 +0000 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQv4W-0002i9-MU for linux-arm-kernel@lists.infradead.org; Tue, 01 Oct 2013 08:12:45 +0000 Received: by mail-pa0-f47.google.com with SMTP id kp14so7022697pab.20 for ; Tue, 01 Oct 2013 01:12:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=SSJxF8Xn0nDqA6fP2JgR8uZveIgF91mkT7KriDFPMcU=; b=V2M9tKH6Z0Jrojdz85oUZpkZukuLADIO3MDpQTGuN6UL9w3CQRm6HYgSIYxUfKMdUL BYeIjG3KbMcROEBogdQAPArMlwbZJnDhCGEFZUwWD9/LS6A4Bd4/VqIr0JYN/5jkRfck HzpuGmfA5vAzKLi2sqjcMzIxYjEiZ9qVMXTiYsatAA+mRJsm1xtJtUKItGQZbVBLSEd9 LSIARd/bFEZm9e5L0617eVXSKU8J7cSQckM/crOKe5mleqBxWSctNcI+Hor6A/8QOQoL KBSaBih7axpK+dHMc2B8eCSI5Ae8j/u8EIbURxFajeaBobt9WYBdwaIR1KHy7+qWxoht vuew== X-Received: by 10.66.156.229 with SMTP id wh5mr7344932pab.156.1380615142571; Tue, 01 Oct 2013 01:12:22 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id f2sm5263960pbg.44.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Oct 2013 01:12:21 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Tue, 01 Oct 2013 17:12:48 +0900 Message-Id: <20131001081248.4136.41380.sendpatchset@w520> In-Reply-To: <20131001081143.4136.46925.sendpatchset@w520> References: <20131001081143.4136.46925.sendpatchset@w520> Subject: [PATCH 06/10] ARM: shmobile: r8a7791 Arch timer workaround X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131001_041244_866922_C0B047E3 X-CRM114-Status: GOOD ( 10.13 ) X-Spam-Score: 1.4 (+) Cc: ryo.kataoka.wt@renesas.com, kuninori.morimoto.gx@renesas.com, arnd@arndb.de, Magnus Damm , hisashi.nakamura.ak@renesas.com, horms@verge.net.au, yoshikazu.fujikawa.ue@renesas.com, linux-arm-kernel@lists.infradead.org, olof@lixom.net, khilman@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Make use of the R-Car Gen2 arch timer workaround on r8a7791. Signed-off-by: Magnus Damm --- 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 #include #include +#include #include #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 */