clk: mediatek: add support to configure clock driver parent

This patch adds support for a clock node to configure its parent clock
where possible.

Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>

diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 7d145f4975a33faf6f965a7916ebd5cee4469eb3..a537ff259feca2c90ebb31a0c8866f3183e54f92 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -42,20 +42,14 @@
  * the accurate frequency.
  */
 static ulong mtk_clk_find_parent_rate(struct clk *clk, int id,
-                                     const struct driver *drv)
+                                     struct udevice *pdev)
 {
        struct clk parent = { .id = id, };
 
-       if (drv) {
-               struct udevice *dev;
-
-               if (uclass_get_device_by_driver(UCLASS_CLK, drv, &dev))
-                       return -ENODEV;
-
-               parent.dev = dev;
-       } else {
+       if (pdev)
+               parent.dev = pdev;
+       else
                parent.dev = clk->dev;
-       }
 
        return clk_get_rate(&parent);
 }
@@ -296,7 +290,7 @@ static ulong mtk_topckgen_get_factor_rate(struct clk *clk, u32 off)
        switch (fdiv->flags & CLK_PARENT_MASK) {
        case CLK_PARENT_APMIXED:
                rate = mtk_clk_find_parent_rate(clk, fdiv->parent,
-                               DM_DRIVER_GET(mtk_clk_apmixedsys));
+                                               priv->parent);
                break;
        case CLK_PARENT_TOPCKGEN:
                rate = mtk_clk_find_parent_rate(clk, fdiv->parent, NULL);
@@ -321,9 +315,18 @@ static ulong mtk_topckgen_get_mux_rate(struct clk *clk, u32 off)
 
        if (mux->parent[index] > 0 ||
            (mux->parent[index] == CLK_XTAL &&
-            priv->tree->flags & CLK_BYPASS_XTAL))
-               return mtk_clk_find_parent_rate(clk, mux->parent[index],
-                                               NULL);
+            priv->tree->flags & CLK_BYPASS_XTAL)) {
+               switch (mux->flags & CLK_PARENT_MASK) {
+               case CLK_PARENT_APMIXED:
+                       return mtk_clk_find_parent_rate(clk, mux->parent[index],
+                                                       priv->parent);
+                       break;
+               default:
+                       return mtk_clk_find_parent_rate(clk, mux->parent[index],
+                                                       NULL);
+                       break;
+               }
+       }
 
        return priv->tree->xtal_rate;
 }
@@ -342,7 +345,7 @@ static ulong mtk_topckgen_get_rate(struct clk *clk)
                                                 priv->tree->muxes_offs);
 }
 
-static int mtk_topckgen_enable(struct clk *clk)
+static int mtk_clk_mux_enable(struct clk *clk)
 {
        struct mtk_clk_priv *priv = dev_get_priv(clk->dev);
        const struct mtk_composite *mux;
@@ -375,7 +378,7 @@ static int mtk_topckgen_enable(struct clk *clk)
        return 0;
 }
 
-static int mtk_topckgen_disable(struct clk *clk)
+static int mtk_clk_mux_disable(struct clk *clk)
 {
        struct mtk_clk_priv *priv = dev_get_priv(clk->dev);
        const struct mtk_composite *mux;
@@ -401,7 +404,7 @@ static int mtk_topckgen_disable(struct clk *clk)
        return 0;
 }
 
-static int mtk_topckgen_set_parent(struct clk *clk, struct clk *parent)
+static int mtk_common_clk_set_parent(struct clk *clk, struct clk *parent)
 {
        struct mtk_clk_priv *priv = dev_get_priv(clk->dev);
 
@@ -473,19 +476,7 @@ static ulong mtk_clk_gate_get_rate(struct clk *clk)
        struct mtk_cg_priv *priv = dev_get_priv(clk->dev);
        const struct mtk_gate *gate = &priv->gates[clk->id];
 
-       switch (gate->flags & CLK_PARENT_MASK) {
-       case CLK_PARENT_APMIXED:
-               return mtk_clk_find_parent_rate(clk, gate->parent,
-                               DM_DRIVER_GET(mtk_clk_apmixedsys));
-               break;
-       case CLK_PARENT_TOPCKGEN:
-               return mtk_clk_find_parent_rate(clk, gate->parent,
-                               DM_DRIVER_GET(mtk_clk_topckgen));
-               break;
-
-       default:
-               return priv->tree->xtal_rate;
-       }
+       return mtk_clk_find_parent_rate(clk, gate->parent, priv->parent);
 }
 
 const struct clk_ops mtk_clk_apmixedsys_ops = {
@@ -496,10 +487,10 @@ const struct clk_ops mtk_clk_apmixedsys_ops = {
 };
 
 const struct clk_ops mtk_clk_topckgen_ops = {
-       .enable = mtk_topckgen_enable,
-       .disable = mtk_topckgen_disable,
+       .enable = mtk_clk_mux_enable,
+       .disable = mtk_clk_mux_disable,
        .get_rate = mtk_topckgen_get_rate,
-       .set_parent = mtk_topckgen_set_parent,
+       .set_parent = mtk_common_clk_set_parent,
 };
 
 const struct clk_ops mtk_clk_gate_ops = {
@@ -512,11 +503,22 @@ int mtk_common_clk_init(struct udevice *dev,
                        const struct mtk_clk_tree *tree)
 {
        struct mtk_clk_priv *priv = dev_get_priv(dev);
+       struct udevice *parent;
+       int ret;
 
        priv->base = dev_read_addr_ptr(dev);
        if (!priv->base)
                return -ENOENT;
 
+       ret = uclass_get_device_by_phandle(UCLASS_CLK, dev, "clock-parent", &parent);
+       if (ret || !parent) {
+               ret = uclass_get_device_by_driver(UCLASS_CLK,
+                               DM_DRIVER_GET(mtk_clk_apmixedsys), &parent);
+               if (ret || !parent)
+                       return -ENOENT;
+       }
+
+       priv->parent = parent;
        priv->tree = tree;
 
        return 0;
@@ -527,11 +529,22 @@ int mtk_common_clk_gate_init(struct udevice *dev,
                             const struct mtk_gate *gates)
 {
        struct mtk_cg_priv *priv = dev_get_priv(dev);
+       struct udevice *parent;
+       int ret;
 
        priv->base = dev_read_addr_ptr(dev);
        if (!priv->base)
                return -ENOENT;
 
+       ret = uclass_get_device_by_phandle(UCLASS_CLK, dev, "clock-parent", &parent);
+       if (ret || !parent) {
+               ret = uclass_get_device_by_driver(UCLASS_CLK,
+                               DM_DRIVER_GET(mtk_clk_topckgen), &parent);
+               if (ret || !parent)
+                       return -ENOENT;
+       }
+
+       priv->parent = parent;
        priv->tree = tree;
        priv->gates = gates;
 

diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index e0c5550c80898c94b2474015d67d5615dd36c4b5..41854879c6af585d91d476657e7bd54e6a9d5351 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -206,11 +206,13 @@ struct mtk_clk_tree {
 };
 
 struct mtk_clk_priv {
+       struct udevice *parent;
        void __iomem *base;
        const struct mtk_clk_tree *tree;
 };
 
 struct mtk_cg_priv {
+       struct udevice *parent;
        void __iomem *base;
        const struct mtk_clk_tree *tree;
        const struct mtk_gate *gates;