Thread (28 messages) 28 messages, 3 authors, 2019-02-01

Re: [PATCH v3 03/12] clk: mediatek: add configurable pcwibits and fmin to mtk_pll_data

From: Weiyi Lu <hidden>
Date: 2019-02-01 08:22:22
Also in: linux-clk, linux-mediatek, lkml, stable

On Fri, 2018-12-14 at 14:02 -0800, Stephen Boyd wrote:
Quoting Weiyi Lu (2018-12-09 23:32:31)
quoted
diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
index f0ff5f535c7e..81400601f107 100644
--- a/drivers/clk/mediatek/clk-pll.c
+++ b/drivers/clk/mediatek/clk-pll.c
@@ -69,11 +71,13 @@ static unsigned long __mtk_pll_recalc_rate(struct mtk_clk_pll *pll, u32 fin,
 {
        int pcwbits = pll->data->pcwbits;
        int pcwfbits;
+       int ibits;
        u64 vco;
        u8 c = 0;
 
        /* The fractional part of the PLL divider. */
-       pcwfbits = pcwbits > INTEGER_BITS ? pcwbits - INTEGER_BITS : 0;
+       ibits = pll->data->pcwibits ? pll->data->pcwibits : INTEGER_BITS;
+       pcwfbits = pcwbits > ibits ? pcwbits - ibits : 0;
This is practically unreadable. It should be changed to an if statement.
OK, will be fixed in next version.
quoted
 
        vco = (u64)fin * pcw;
 
@@ -167,9 +171,10 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
 static void mtk_pll_calc_values(struct mtk_clk_pll *pll, u32 *pcw, u32 *postdiv,
                u32 freq, u32 fin)
 {
-       unsigned long fmin = 1000 * MHZ;
+       unsigned long fmin = pll->data->fmin ? pll->data->fmin : (1000 * MHZ);
        const struct mtk_pll_div_table *div_table = pll->data->div_table;
        u64 _pcw;
+       int ibits;
        u32 val;
 
        if (freq > pll->data->fmax)
@@ -193,7 +198,8 @@ static void mtk_pll_calc_values(struct mtk_clk_pll *pll, u32 *pcw, u32 *postdiv,
        }
 
        /* _pcw = freq * postdiv / fin * 2^pcwfbits */
-       _pcw = ((u64)freq << val) << (pll->data->pcwbits - INTEGER_BITS);
+       ibits = pll->data->pcwibits ? pll->data->pcwibits : INTEGER_BITS;
+       _pcw = ((u64)freq << val) << (pll->data->pcwbits - ibits);
Similar comment. Readability is low here.
I thought these two lines here are clean enough. Just simple conditional
assignment and shift operation. I'd like to not to change it.




_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help