clk: ingenic: Support overriding PLLs M/N/OD calc algorithm

SoC-specific code can now provide a callback if they need to compute the
M/N/OD values in a specific way.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Tested-by: 周琰杰 (Zhou Yanjie)<zhouyanjie@wanyeetech.com>   # on CU1000-neo/X1000E
Link: https://lore.kernel.org/r/20210530164923.18134-6-paul@crapouillou.net
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/ingenic/cgu.c b/drivers/clk/ingenic/cgu.c
index 58f7ab5cf0fee11c9b1a921cfd8c37bbef23c3df..266c7595d33022878b05a208bc4000258d61e466 100644 (file)
--- a/drivers/clk/ingenic/cgu.c
+++ b/drivers/clk/ingenic/cgu.c
@@ -119,28 +119,42 @@ ingenic_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)
                n * od);
 }
 
-static unsigned long
-ingenic_pll_calc(const struct ingenic_cgu_clk_info *clk_info,
-                unsigned long rate, unsigned long parent_rate,
-                unsigned *pm, unsigned *pn, unsigned *pod)
+static void
+ingenic_pll_calc_m_n_od(const struct ingenic_cgu_pll_info *pll_info,
+                       unsigned long rate, unsigned long parent_rate,
+                       unsigned int *pm, unsigned int *pn, unsigned int *pod)
 {
-       const struct ingenic_cgu_pll_info *pll_info;
-       unsigned m, n, od;
-
-       pll_info = &clk_info->pll;
-       od = 1;
+       unsigned int m, n, od = 1;
 
        /*
         * The frequency after the input divider must be between 10 and 50 MHz.
         * The highest divider yields the best resolution.
         */
        n = parent_rate / (10 * MHZ);
-       n = min_t(unsigned, n, 1 << clk_info->pll.n_bits);
-       n = max_t(unsigned, n, pll_info->n_offset);
+       n = min_t(unsigned int, n, 1 << pll_info->n_bits);
+       n = max_t(unsigned int, n, pll_info->n_offset);
 
        m = (rate / MHZ) * od * n / (parent_rate / MHZ);
-       m = min_t(unsigned, m, 1 << clk_info->pll.m_bits);
-       m = max_t(unsigned, m, pll_info->m_offset);
+       m = min_t(unsigned int, m, 1 << pll_info->m_bits);
+       m = max_t(unsigned int, m, pll_info->m_offset);
+
+       *pm = m;
+       *pn = n;
+       *pod = od;
+}
+
+static unsigned long
+ingenic_pll_calc(const struct ingenic_cgu_clk_info *clk_info,
+                unsigned long rate, unsigned long parent_rate,
+                unsigned int *pm, unsigned int *pn, unsigned int *pod)
+{
+       const struct ingenic_cgu_pll_info *pll_info = &clk_info->pll;
+       unsigned int m, n, od;
+
+       if (pll_info->calc_m_n_od)
+               (*pll_info->calc_m_n_od)(pll_info, rate, parent_rate, &m, &n, &od);
+       else
+               ingenic_pll_calc_m_n_od(pll_info, rate, parent_rate, &m, &n, &od);
 
        if (pm)
                *pm = m;

diff --git a/drivers/clk/ingenic/cgu.h b/drivers/clk/ingenic/cgu.h
index 10521d1b7b127cde65c9194adfc5788124981848..bfc2b9c38a4180db08518fa972089313c52fdbca 100644 (file)
--- a/drivers/clk/ingenic/cgu.h
+++ b/drivers/clk/ingenic/cgu.h
@@ -55,6 +55,9 @@ struct ingenic_cgu_pll_info {
        s8 bypass_bit;
        u8 enable_bit;
        u8 stable_bit;
+       void (*calc_m_n_od)(const struct ingenic_cgu_pll_info *pll_info,
+                           unsigned long rate, unsigned long parent_rate,
+                           unsigned int *m, unsigned int *n, unsigned int *od);
 };
 
 /**