From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF608CCA46F for ; Wed, 1 Jun 2022 14:11:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354747AbiFAOLm (ORCPT ); Wed, 1 Jun 2022 10:11:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354644AbiFAOJg (ORCPT ); Wed, 1 Jun 2022 10:09:36 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4B3DDF61; Wed, 1 Jun 2022 07:01:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 928D3B81AE7; Wed, 1 Jun 2022 14:01:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECD29C341C0; Wed, 1 Jun 2022 14:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654092065; bh=v3S7+R/sqeurSfR1qnzvW17UXWm4tAY5LvvhEotC0/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WPnj6FY3j1y0HlonOZz4Fsj3VAqv29aTraydBFX3KtM5AUvWqUVlclr8k8LD3Upl3 SMJRAU0+/udkw/Y11MwWScLNj5ONEG6EDm0ukLEgapbE4XJ32ljz8N9ucRBeRIdOu/ V+3gkR7JN3QDpOZWi++AsNYUViW312qdSKiASw6jnOVfHldwmms7dPuzJ4MGiKiEeU OGAvSU38udtZT6tobSOKCis0237vut9jYQbx5NVwrSYNxwRDLFXpnM+bP+nfmLHyVj MGShB3d5paUWbFkf32RzoSjk/YoqbbTe+QVLdiq8reswwPn7Lk5NMyQOE6TdVloEPL CMaNf1zpW2YCw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Janusz Krzysztofik , Tony Lindgren , Arnd Bergmann , Sasha Levin , paul@pwsan.com, aaro.koskinen@iki.fi, linux@armlinux.org.uk, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.9 02/11] ARM: OMAP1: clock: Fix UART rate reporting algorithm Date: Wed, 1 Jun 2022 10:00:51 -0400 Message-Id: <20220601140100.2005469-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220601140100.2005469-1-sashal@kernel.org> References: <20220601140100.2005469-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Janusz Krzysztofik [ Upstream commit 338d5d476cde853dfd97378d20496baabc2ce3c0 ] Since its introduction to the mainline kernel, omap1_uart_recalc() helper makes incorrect use of clk->enable_bit as a ready to use bitmap mask while it only provides the bit number. Fix it. Signed-off-by: Janusz Krzysztofik Acked-by: Tony Lindgren Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/mach-omap1/clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 034b89499bd7..a3599696e7cc 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c @@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(clockfw_lock); unsigned long omap1_uart_recalc(struct clk *clk) { unsigned int val = __raw_readl(clk->enable_reg); - return val & clk->enable_bit ? 48000000 : 12000000; + return val & 1 << clk->enable_bit ? 48000000 : 12000000; } unsigned long omap1_sossi_recalc(struct clk *clk) -- 2.35.1