clk: mediatek: add support for gates in clk_tree for infrasys

Add support for gates in clk_tree for infrasys ops.

Infracfg clks can have a sum of gates and muxes, and current solution
handle this by duplicating the driver and split clks for mux and clks
for gates. Upstream linux kernel handle this differently and doesn't
have this distinction.

To be closer to the upstream kernel clock definition, implement
additional logic to have gates defined in the clk_tree and implement
variant for the infrasys ops to handle gates defined in the tree.

Similar to how it's done with factor and mux, we introduce gates_offs.
Upstream kernel follow the similar logic with all the ID defined as
FDIVS, MUXES and finally GATES.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 6d4506ddc4a79ff4fbfbeceb313902903ae62fd6..986e73542d83c5898627f0efb1e04643665b5dc0 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -405,9 +405,26 @@ static ulong mtk_infrasys_get_rate(struct clk *clk)
        } else if (clk->id < priv->tree->muxes_offs) {
                rate = mtk_infrasys_get_factor_rate(clk, clk->id -
                                                    priv->tree->fdivs_offs);
-       } else {
+       /* No gates defined or ID is a MUX */
+       } else if (!priv->tree->gates || clk->id < priv->tree->gates_offs) {
                rate = mtk_infrasys_get_mux_rate(clk, clk->id -
                                                 priv->tree->muxes_offs);
+       /* Only valid with muxes + gates implementation */
+       } else {
+               struct udevice *parent = NULL;
+               const struct mtk_gate *gate;
+
+               gate = &priv->tree->gates[clk->id - priv->tree->gates_offs];
+               if (gate->flags & CLK_PARENT_TOPCKGEN)
+                       parent = priv->parent;
+               /*
+                * Assume xtal_rate to be declared if some gates have
+                * XTAL as parent
+                */
+               else if (gate->flags & CLK_PARENT_XTAL)
+                       return priv->tree->xtal_rate;
+
+               rate = mtk_clk_find_parent_rate(clk, gate->parent, parent);
        }
 
        return rate;
@@ -485,24 +502,22 @@ static int mtk_common_clk_set_parent(struct clk *clk, struct clk *parent)
 
 /* CG functions */
 
-static int mtk_clk_gate_enable(struct clk *clk)
+static int mtk_gate_enable(void __iomem *base, const struct mtk_gate *gate)
 {
-       struct mtk_cg_priv *priv = dev_get_priv(clk->dev);
-       const struct mtk_gate *gate = &priv->gates[clk->id];
        u32 bit = BIT(gate->shift);
 
        switch (gate->flags & CLK_GATE_MASK) {
        case CLK_GATE_SETCLR:
-               writel(bit, priv->base + gate->regs->clr_ofs);
+               writel(bit, base + gate->regs->clr_ofs);
                break;
        case CLK_GATE_SETCLR_INV:
-               writel(bit, priv->base + gate->regs->set_ofs);
+               writel(bit, base + gate->regs->set_ofs);
                break;
        case CLK_GATE_NO_SETCLR:
-               clrsetbits_le32(priv->base + gate->regs->sta_ofs, bit, 0);
+               clrsetbits_le32(base + gate->regs->sta_ofs, bit, 0);
                break;
        case CLK_GATE_NO_SETCLR_INV:
-               clrsetbits_le32(priv->base + gate->regs->sta_ofs, bit, bit);
+               clrsetbits_le32(base + gate->regs->sta_ofs, bit, bit);
                break;
 
        default:
@@ -512,24 +527,43 @@ static int mtk_clk_gate_enable(struct clk *clk)
        return 0;
 }
 
-static int mtk_clk_gate_disable(struct clk *clk)
+static int mtk_clk_gate_enable(struct clk *clk)
 {
        struct mtk_cg_priv *priv = dev_get_priv(clk->dev);
        const struct mtk_gate *gate = &priv->gates[clk->id];
+
+       return mtk_gate_enable(priv->base, gate);
+}
+
+static int mtk_clk_infrasys_enable(struct clk *clk)
+{
+       struct mtk_cg_priv *priv = dev_get_priv(clk->dev);
+       const struct mtk_gate *gate;
+
+       /* MUX handling */
+       if (!priv->tree->gates || clk->id < priv->tree->gates_offs)
+               return mtk_clk_mux_enable(clk);
+
+       gate = &priv->tree->gates[clk->id - priv->tree->gates_offs];
+       return mtk_gate_enable(priv->base, gate);
+}
+
+static int mtk_gate_disable(void __iomem *base, const struct mtk_gate *gate)
+{
        u32 bit = BIT(gate->shift);
 
        switch (gate->flags & CLK_GATE_MASK) {
        case CLK_GATE_SETCLR:
-               writel(bit, priv->base + gate->regs->set_ofs);
+               writel(bit, base + gate->regs->set_ofs);
                break;
        case CLK_GATE_SETCLR_INV:
-               writel(bit, priv->base + gate->regs->clr_ofs);
+               writel(bit, base + gate->regs->clr_ofs);
                break;
        case CLK_GATE_NO_SETCLR:
-               clrsetbits_le32(priv->base + gate->regs->sta_ofs, bit, bit);
+               clrsetbits_le32(base + gate->regs->sta_ofs, bit, bit);
                break;
        case CLK_GATE_NO_SETCLR_INV:
-               clrsetbits_le32(priv->base + gate->regs->sta_ofs, bit, 0);
+               clrsetbits_le32(base + gate->regs->sta_ofs, bit, 0);
                break;
 
        default:
@@ -539,6 +573,27 @@ static int mtk_clk_gate_disable(struct clk *clk)
        return 0;
 }
 
+static int mtk_clk_gate_disable(struct clk *clk)
+{
+       struct mtk_cg_priv *priv = dev_get_priv(clk->dev);
+       const struct mtk_gate *gate = &priv->gates[clk->id];
+
+       return mtk_gate_disable(priv->base, gate);
+}
+
+static int mtk_clk_infrasys_disable(struct clk *clk)
+{
+       struct mtk_cg_priv *priv = dev_get_priv(clk->dev);
+       const struct mtk_gate *gate;
+
+       /* MUX handling */
+       if (!priv->tree->gates || clk->id < priv->tree->gates_offs)
+               return mtk_clk_mux_disable(clk);
+
+       gate = &priv->tree->gates[clk->id - priv->tree->gates_offs];
+       return mtk_gate_disable(priv->base, gate);
+}
+
 static ulong mtk_clk_gate_get_rate(struct clk *clk)
 {
        struct mtk_cg_priv *priv = dev_get_priv(clk->dev);
@@ -569,8 +624,8 @@ const struct clk_ops mtk_clk_topckgen_ops = {
 };
 
 const struct clk_ops mtk_clk_infrasys_ops = {
-       .enable = mtk_clk_mux_enable,
-       .disable = mtk_clk_mux_disable,
+       .enable = mtk_clk_infrasys_enable,
+       .disable = mtk_clk_infrasys_disable,
        .get_rate = mtk_infrasys_get_rate,
        .set_parent = mtk_common_clk_set_parent,
 };

diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index 48ce16484ec2a414b111bd6acac03d8ad4cd32ef..8dde9e56e811ec2fe5402f931319b8543def8b76 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -200,10 +200,12 @@ struct mtk_clk_tree {
        unsigned long xtal2_rate;
        const int fdivs_offs;
        const int muxes_offs;
+       const int gates_offs;
        const struct mtk_pll_data *plls;
        const struct mtk_fixed_clk *fclks;
        const struct mtk_fixed_factor *fdivs;
        const struct mtk_composite *muxes;
+       const struct mtk_gate *gates;
        u32 flags;
 };