From patchwork Tue Mar 9 09:44:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 12124567 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 245AEC433E0 for ; Tue, 9 Mar 2021 09:45:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E48CA6518F for ; Tue, 9 Mar 2021 09:45:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229480AbhCIJpD (ORCPT ); Tue, 9 Mar 2021 04:45:03 -0500 Received: from www.zeus03.de ([194.117.254.33]:47642 "EHLO mail.zeus03.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229599AbhCIJo4 (ORCPT ); Tue, 9 Mar 2021 04:44:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=k1; bh=0GdiwLt880S3sdXO/RyJxSgROeU rK2LVzRv4wwGhtQo=; b=W7M3g2swvtSrwmKW2hAOO+HXD8PUp4IuycAmiVxPYf/ oAB3j8GIjzh6mISPbU9HbgRT2YLjgM2ESLFKaV7WNROQe/YKVeqDJ+W/gYP6/0Qu Jbbs0709Dn01jC1JfhrGFb9+1YWhlIUy585ndg6EyN2sRgHO0Cuv4dg/Zuu5xsyM = Received: (qmail 3426718 invoked from network); 9 Mar 2021 10:44:53 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 9 Mar 2021 10:44:53 +0100 X-UD-Smtp-Session: l3s3148p1@Ihj+Zhe9AosgAwDPXw8WAIb6kxwVO+fo From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Daniel Lezcano , Geert Uytterhoeven , =?utf-8?q?Niklas_S=C3=B6derlund?= , Wolfram Sang , Phong Hoang , Geert Uytterhoeven , =?utf-8?q?Niklas_S=C3=B6derlu?= =?utf-8?q?nd?= Subject: [PATCH v2] clocksource: sh_cmt: don't use CMTOUT_IE with R-Car Gen2/3 Date: Tue, 9 Mar 2021 10:44:48 +0100 Message-Id: <20210309094448.31823-1-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org CMTOUT_IE is only supported for older SoCs. Newer SoCs shall not set this bit. So, add a version check. Reported-by: Phong Hoang Reviewed-by: Geert Uytterhoeven Reviewed-by: Niklas Söderlund Signed-off-by: Wolfram Sang --- Changes since v1: * updated $subject * added tags drivers/clocksource/sh_cmt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index c98f8851fd68..d7ed99f0001f 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -339,8 +339,9 @@ static int sh_cmt_enable(struct sh_cmt_channel *ch) sh_cmt_write_cmcsr(ch, SH_CMT16_CMCSR_CMIE | SH_CMT16_CMCSR_CKS512); } else { - sh_cmt_write_cmcsr(ch, SH_CMT32_CMCSR_CMM | - SH_CMT32_CMCSR_CMTOUT_IE | + u32 cmtout = ch->cmt->info->model <= SH_CMT_48BIT ? + SH_CMT32_CMCSR_CMTOUT_IE : 0; + sh_cmt_write_cmcsr(ch, cmtout | SH_CMT32_CMCSR_CMM | SH_CMT32_CMCSR_CMR_IRQ | SH_CMT32_CMCSR_CKS_RCLK8); }