| From f2433798ed782a13c8322d1022d3e9075ae3d600 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 10 Apr 2022 15:07:54 +0200 |
| Subject: ARM: OMAP1: clock: Fix UART rate reporting algorithm |
| |
| From: Janusz Krzysztofik <jmkrzyszt@gmail.com> |
| |
| [ 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 <jmkrzyszt@gmail.com> |
| Acked-by: Tony Lindgren <tony@atomide.com> |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 |
| |
