lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 161/667] ARM: OMAP1: clock: Fix UART rate reporting algorithm
    Date
    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 9d4a0ab50a46..d63d5eb8d8fd 100644
    --- a/arch/arm/mach-omap1/clock.c
    +++ b/arch/arm/mach-omap1/clock.c
    @@ -41,7 +41,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


    \
     
     \ /
      Last update: 2022-06-07 20:30    [W:4.069 / U:0.808 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site