From nobody Mon Sep 29 22:37:12 2025 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 C2D41C00140 for ; Tue, 16 Aug 2022 00:18:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351961AbiHPASb (ORCPT ); Mon, 15 Aug 2022 20:18:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353234AbiHPAKm (ORCPT ); Mon, 15 Aug 2022 20:10:42 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5094DCCE18; Mon, 15 Aug 2022 13:29:29 -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 911E4B80EB1; Mon, 15 Aug 2022 20:29:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92BBEC433D6; Mon, 15 Aug 2022 20:29:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660595365; bh=REkwR5J41q/Hrazw8AkkdOJJpFzFGfPiF5Ij9pcyQ+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rFYt1SFst0oribzCjK7N9Fn4ZRrsEs3fogVl6jxvwDxIpTO8BFhZzx1mc7U1KfILg HYY2ShnNq8dxuJmRjWNQjjQRGvWUZjJDJmubndPn7iVAN18d+KfxjBHXKThqJJQP1y xn2vudxCub5TQfuBxNzLIl1Uv1MOKNt+gtaXB0A4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Abel Vesa , Michael Turquette , Stephen Boyd , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Peng Fan , Liu Ying , Abel Vesa , Sasha Levin Subject: [PATCH 5.19 0724/1157] clk: imx: clk-fracn-gppll: Return rate in rate table properly in ->recalc_rate() Date: Mon, 15 Aug 2022 20:01:20 +0200 Message-Id: <20220815180508.438042675@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Liu Ying [ Upstream commit 5ebaf9f7da5bb2dc56d394eabfcbe46dc6b1ea8d ] The PLL parameters in rate table should be directly compared with those read from PLL registers instead of the cooked ones. Fixes: 1b26cb8a77a4 ("clk: imx: support fracn gppll") Cc: Abel Vesa Cc: Michael Turquette Cc: Stephen Boyd Cc: Shawn Guo Cc: Sascha Hauer Cc: Pengutronix Kernel Team Cc: Fabio Estevam Cc: NXP Linux Team Cc: Peng Fan Signed-off-by: Liu Ying Reviewed-by: Peng Fan Reviewed-by: Abel Vesa Link: https://lore.kernel.org/r/20220609132902.3504651-6-peng.fan@oss.nxp.c= om Signed-off-by: Abel Vesa Signed-off-by: Sasha Levin --- drivers/clk/imx/clk-fracn-gppll.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/clk/imx/clk-fracn-gppll.c b/drivers/clk/imx/clk-fracn-= gppll.c index 36a53c60e71f..cb06b0045e9e 100644 --- a/drivers/clk/imx/clk-fracn-gppll.c +++ b/drivers/clk/imx/clk-fracn-gppll.c @@ -131,18 +131,7 @@ static unsigned long clk_fracn_gppll_recalc_rate(struc= t clk_hw *hw, unsigned lon mfi =3D FIELD_GET(PLL_MFI_MASK, pll_div); =20 rdiv =3D FIELD_GET(PLL_RDIV_MASK, pll_div); - rdiv =3D rdiv + 1; odiv =3D FIELD_GET(PLL_ODIV_MASK, pll_div); - switch (odiv) { - case 0: - odiv =3D 2; - break; - case 1: - odiv =3D 3; - break; - default: - break; - } =20 /* * Sometimes, the recalculated rate has deviation due to @@ -160,6 +149,19 @@ static unsigned long clk_fracn_gppll_recalc_rate(struc= t clk_hw *hw, unsigned lon if (rate) return (unsigned long)rate; =20 + rdiv =3D rdiv + 1; + + switch (odiv) { + case 0: + odiv =3D 2; + break; + case 1: + odiv =3D 3; + break; + default: + break; + } + /* Fvco =3D Fref * (MFI + MFN / MFD) */ fvco =3D fvco * mfi * mfd + fvco * mfn; do_div(fvco, mfd * rdiv * odiv); --=20 2.35.1