From patchwork Mon Jul 31 15:05:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 9872209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1801A60375 for ; Mon, 31 Jul 2017 15:25:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2C3A205AF for ; Mon, 31 Jul 2017 15:25:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E77892807B; Mon, 31 Jul 2017 15:25:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 750C9205AF for ; Mon, 31 Jul 2017 15:25:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ecAVjp2DVmP1tf63N9bAro9XHWhXuOAtxRaNBdw+q1w=; b=b6fVDwHDbW5aIkKgXow8WtF31Q j6x7rihhdardGoXlqVozDP/4EtEU8n+DoL2vzg0cXXoxybNfmY8Xoz2awOKS97cMQvXkytN8KnuAh oBB7Kvtu4UKk+JRKDZKiv1JbTHh3Liz7HG6AYIMDF5E33fdHhXrpsC2TSJu9eILVPLs1k3rno5Mee VbK8PVGAWd45VobOxAFiCYMwTxDrzc4bzanSWOOGTWeGd2kpGC4sBTiq6Iw12HLfNpIwofDa9EBvm fbBnN9M+ckSRMOaA4FbLFBBJwksUsgeL4cvp+FOkMeib4Pc4I3RWZEcwO3d4olORXBO80w+0kiS6S 5NPqpBWw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dcCZn-0006Yh-3j; Mon, 31 Jul 2017 15:25:47 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dcCRo-0003GF-HR for linux-arm-kernel@lists.infradead.org; Mon, 31 Jul 2017 15:17:34 +0000 Received: from penelope.horms.nl (unknown [217.111.208.18]) by kirsty.vergenet.net (Postfix) with ESMTPA id 4F86425BF02; Tue, 1 Aug 2017 01:05:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1501513545; bh=DpEW4DpUi76pQ/pGcTvHMM6F2yEy5vOi9/GvgJT6Xdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D3c6ela8bqxBOlMGIs7V/ok+afh6SlpFdHsXJRZQKAfKPdPLVqH0qILSqzK81rWYw jtajWAS+T7o73VBjpbqRsZARel20moDsT0RFJ908AuISCSu7eGqAy1KdkREbmHm8Ig LVRJm7EUYM7DkQxk/95RvArfou+R5I4ReD7l1X9Y= Received: by penelope.horms.nl (Postfix, from userid 7100) id 8FC5DE20569; Mon, 31 Jul 2017 17:05:41 +0200 (CEST) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Subject: [PATCH 4/5] ARM: shmobile: rcar-gen2: Correct arch timer frequency on RZ/G1E Date: Mon, 31 Jul 2017 17:05:39 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170731_081732_740563_33E53AFA X-CRM114-Status: GOOD ( 10.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Horman , Magnus Damm , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Geert Uytterhoeven According to the datasheet, the frequency of the ARM architecture timer on RZ/G1E depends on the frequency of the ZS clock, just like on R-Car E2 and V2H. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/setup-rcar-gen2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index 3bd505da3172..7ab1690fab82 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -70,7 +70,8 @@ void __init rcar_gen2_timer_init(void) void __iomem *base; u32 freq; - if (of_machine_is_compatible("renesas,r8a7792") || + if (of_machine_is_compatible("renesas,r8a7745") || + of_machine_is_compatible("renesas,r8a7792") || of_machine_is_compatible("renesas,r8a7794")) { freq = 260000000 / 8; /* ZS / 8 */ /* CNTVOFF has to be initialized either from non-secure