Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

clk: renesas: rzg2l: Add support for RZ/G3S PLL

Browse Source 
Add support for reading the frequency of PLL1/4/6 as available on
RZ/G3S.  The computation formula for the PLL frequency is as follows:

    Fout = (nir + nfr / 4096) * Fin / (mr * pr)

Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20230929053915.1530607-8-claudiu.beznea@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
This commit is contained in:
Claudiu Beznea 2023-09-29 08:38:54 +03:00 committed by Geert Uytterhoeven
parent 5f710e3bc5
commit 01eabef547
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/clk/renesas/rzg2l-cpg.c
View File

@ -47,6 +47,11 @@
#define PDIV(val) FIELD_GET(GENMASK(5, 0), val) #define PDIV(val) FIELD_GET(GENMASK(5, 0), val)
#define SDIV(val) FIELD_GET(GENMASK(2, 0), val) #define SDIV(val) FIELD_GET(GENMASK(2, 0), val)
#define RZG3S_DIV_P GENMASK(28, 26)
#define RZG3S_DIV_M GENMASK(25, 22)
#define RZG3S_DIV_NI GENMASK(21, 13)
#define RZG3S_DIV_NF GENMASK(12, 1)
#define CLK_ON_R(reg) (reg) #define CLK_ON_R(reg) (reg)
#define CLK_MON_R(reg) (0x180 + (reg)) #define CLK_MON_R(reg) (0x180 + (reg))
#define CLK_RST_R(reg) (reg) #define CLK_RST_R(reg) (reg)
@ -713,11 +718,43 @@ static const struct clk_ops rzg2l_cpg_pll_ops = {
.recalc_rate = rzg2l_cpg_pll_clk_recalc_rate, .recalc_rate = rzg2l_cpg_pll_clk_recalc_rate,
}; };
static unsigned long rzg3s_cpg_pll_clk_recalc_rate(struct clk_hw *hw,
unsigned long parent_rate)
{
struct pll_clk *pll_clk = to_pll(hw);
struct rzg2l_cpg_priv *priv = pll_clk->priv;
u32 nir, nfr, mr, pr, val;
u64 rate;
if (pll_clk->type != CLK_TYPE_G3S_PLL)
return parent_rate;
val = readl(priv->base + GET_REG_SAMPLL_CLK1(pll_clk->conf));
pr = 1 << FIELD_GET(RZG3S_DIV_P, val);
/* Hardware interprets values higher than 8 as p = 16. */
if (pr > 8)
pr = 16;
mr = FIELD_GET(RZG3S_DIV_M, val) + 1;
nir = FIELD_GET(RZG3S_DIV_NI, val) + 1;
nfr = FIELD_GET(RZG3S_DIV_NF, val);
rate = mul_u64_u32_shr(parent_rate, 4096 * nir + nfr, 12);
return DIV_ROUND_CLOSEST_ULL(rate, (mr * pr));
}
static const struct clk_ops rzg3s_cpg_pll_ops = {
.recalc_rate = rzg3s_cpg_pll_clk_recalc_rate,
};
static struct clk * __init static struct clk * __init
rzg2l_cpg_pll_clk_register(const struct cpg_core_clk *core, rzg2l_cpg_pll_clk_register(const struct cpg_core_clk *core,
struct clk **clks, struct clk **clks,
void __iomem *base, void __iomem *base,
struct rzg2l_cpg_priv *priv) struct rzg2l_cpg_priv *priv,
const struct clk_ops *ops)
{ {
struct device *dev = priv->dev; struct device *dev = priv->dev;
const struct clk *parent; const struct clk *parent;
@ -735,7 +772,7 @@ rzg2l_cpg_pll_clk_register(const struct cpg_core_clk *core,
parent_name = __clk_get_name(parent); parent_name = __clk_get_name(parent);
init.name = core->name; init.name = core->name;
init.ops = &rzg2l_cpg_pll_ops; init.ops = ops;
init.flags = 0; init.flags = 0;
init.parent_names = &parent_name; init.parent_names = &parent_name;
init.num_parents = 1; init.num_parents = 1;
@ -830,8 +867,12 @@ rzg2l_cpg_register_core_clk(const struct cpg_core_clk *core,
core->mult, div); core->mult, div);
break; break;
case CLK_TYPE_SAM_PLL: case CLK_TYPE_SAM_PLL:
clk = rzg2l_cpg_pll_clk_register(core, priv->clks, clk = rzg2l_cpg_pll_clk_register(core, priv->clks, priv->base, priv,
priv->base, priv); &rzg2l_cpg_pll_ops);
break;
case CLK_TYPE_G3S_PLL:
clk = rzg2l_cpg_pll_clk_register(core, priv->clks, priv->base, priv,
&rzg3s_cpg_pll_ops);
break; break;
case CLK_TYPE_SIPLL5: case CLK_TYPE_SIPLL5:
clk = rzg2l_cpg_sipll5_register(core, priv->clks, priv); clk = rzg2l_cpg_sipll5_register(core, priv->clks, priv);

3
drivers/clk/renesas/rzg2l-cpg.h
View File

@ -102,6 +102,7 @@ enum clk_types {
CLK_TYPE_IN, /* External Clock Input */ CLK_TYPE_IN, /* External Clock Input */
CLK_TYPE_FF, /* Fixed Factor Clock */ CLK_TYPE_FF, /* Fixed Factor Clock */
CLK_TYPE_SAM_PLL, CLK_TYPE_SAM_PLL,
CLK_TYPE_G3S_PLL,
/* Clock with divider */ /* Clock with divider */
CLK_TYPE_DIV, CLK_TYPE_DIV,
@ -129,6 +130,8 @@ enum clk_types {
DEF_TYPE(_name, _id, _type, .parent = _parent) DEF_TYPE(_name, _id, _type, .parent = _parent)
#define DEF_SAMPLL(_name, _id, _parent, _conf) \ #define DEF_SAMPLL(_name, _id, _parent, _conf) \
DEF_TYPE(_name, _id, CLK_TYPE_SAM_PLL, .parent = _parent, .conf = _conf) DEF_TYPE(_name, _id, CLK_TYPE_SAM_PLL, .parent = _parent, .conf = _conf)
#define DEF_G3S_PLL(_name, _id, _parent, _conf) \
DEF_TYPE(_name, _id, CLK_TYPE_G3S_PLL, .parent = _parent, .conf = _conf)
#define DEF_INPUT(_name, _id) \ #define DEF_INPUT(_name, _id) \
DEF_TYPE(_name, _id, CLK_TYPE_IN) DEF_TYPE(_name, _id, CLK_TYPE_IN)
#define DEF_FIXED(_name, _id, _parent, _mult, _div) \ #define DEF_FIXED(_name, _id, _parent, _mult, _div) \