From patchwork Fri Jun 28 11:27:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2798511 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DD902BF4A1 for ; Fri, 28 Jun 2013 11:34:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C4B9D20188 for ; Fri, 28 Jun 2013 11:34:28 +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 BE8BC20179 for ; Fri, 28 Jun 2013 11:34:27 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsWvj-0001K3-8T; Fri, 28 Jun 2013 11:33:32 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsWqe-0002Ip-Mx; Fri, 28 Jun 2013 11:28:16 +0000 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsWqH-0002G9-CG for linux-arm-kernel@lists.infradead.org; Fri, 28 Jun 2013 11:27:54 +0000 Received: by mail-pa0-f48.google.com with SMTP id kp12so2309642pab.7 for ; Fri, 28 Jun 2013 04:27:30 -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=jjUqfUYaHAvDN7yx8Kx57LsdrzDUqlXWvWZrSrC2Ung=; b=f96OtMiiAfDlRdg6V4D/ZjYIXzi8Dc6wxWulAqm7cWfNiLGTEWB7Nquqd/PhU/OiDB 9kc6mO65vCod9auoioM5/veGHfKOzMlXtm22xGsHRAOmZUP2x+JgkOJjaoD4VutzJlil 31i/fosy6/fXrs2wU5Cq2jbF0vj7rnK5HYNSpp7zvk8kXLGEPTZxf2cXYwDO1vyzO0ti vig9puNlCF/y2D8wOAVvWc5F1H+sksJa+NcmkdqR4VROdk628uV0ANUurMMFutvLKw7b xCNAvw5IqrA+MfTij48uwpkj1iKQIjW+NpXNypjR1OWfnVBAOYQSdpB51B2f3teAToi1 gwcg== X-Received: by 10.66.121.131 with SMTP id lk3mr11047893pab.43.1372418850083; Fri, 28 Jun 2013 04:27:30 -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 x8sm7702269pbb.39.2013.06.28.04.27.27 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Jun 2013 04:27:29 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Fri, 28 Jun 2013 20:27:32 +0900 Message-Id: <20130628112732.23809.81527.sendpatchset@w520> In-Reply-To: <20130628112655.23809.39115.sendpatchset@w520> References: <20130628112655.23809.39115.sendpatchset@w520> Subject: [PATCH 04/04] ARM: shmobile: Make r8a73a4 Arch timer optional X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130628_072753_565270_49E8E99F X-CRM114-Status: UNSURE ( 9.73 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: olof@lixom.net, horms@verge.net.au, Magnus Damm , linux-arm-kernel@lists.infradead.org, arnd@arndb.de 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=-5.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 Update the r8a73a4 code to allow using other timers than Arch timer for clock event Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/Kconfig | 1 - arch/arm/mach-shmobile/board-ape6evm.c | 1 + arch/arm/mach-shmobile/include/mach/r8a73a4.h | 1 + arch/arm/mach-shmobile/setup-r8a73a4.c | 8 ++++++++ 4 files changed, 10 insertions(+), 1 deletion(-) --- 0010/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2013-06-28 19:53:49.000000000 +0900 @@ -23,7 +23,6 @@ config ARCH_R8A73A4 select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_GIC select CPU_V7 - select ARM_ARCH_TIMER select SH_CLK_CPG select RENESAS_IRQC select ARCH_HAS_CPUFREQ --- 0001/arch/arm/mach-shmobile/board-ape6evm.c +++ work/arch/arm/mach-shmobile/board-ape6evm.c 2013-06-28 19:55:52.000000000 +0900 @@ -102,6 +102,7 @@ static const char *ape6evm_boards_compat }; DT_MACHINE_START(APE6EVM_DT, "ape6evm") + .init_early = r8a73a4_init_delay, .init_irq = irqchip_init, .init_time = shmobile_timer_init, .init_machine = ape6evm_add_standard_devices, --- 0001/arch/arm/mach-shmobile/include/mach/r8a73a4.h +++ work/arch/arm/mach-shmobile/include/mach/r8a73a4.h 2013-06-28 19:55:15.000000000 +0900 @@ -4,5 +4,6 @@ void r8a73a4_add_standard_devices(void); void r8a73a4_clock_init(void); void r8a73a4_pinmux_init(void); +void r8a73a4_init_delay(void); #endif /* __ASM_R8A73A4_H__ */ --- 0011/arch/arm/mach-shmobile/setup-r8a73a4.c +++ work/arch/arm/mach-shmobile/setup-r8a73a4.c 2013-06-28 19:57:29.000000000 +0900 @@ -203,6 +203,13 @@ void __init r8a73a4_add_standard_devices r8a7790_register_cmt(10); } +void __init r8a73a4_init_delay(void) +{ +#ifndef CONFIG_ARM_ARCH_TIMER + shmobile_setup_delay(1500, 2, 4); /* Cortex-A15 @ 1500MHz */ +#endif +} + #ifdef CONFIG_USE_OF void __init r8a73a4_add_standard_devices_dt(void) { @@ -216,6 +223,7 @@ static const char *r8a73a4_boards_compat }; DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)") + .init_early = r8a73a4_init_delay, .init_irq = irqchip_init, .init_machine = r8a73a4_add_standard_devices_dt, .init_time = shmobile_timer_init,