clk: mediatek: drop parent udevice field

Remove the parent field from the mediatek clock private data structures.
This was no longer used other than debug prints.

The uclass_get_device_* functions had the effect of ensuring that
parents were probed. This is done now by having parent providers
probe on bind, so re-probing here is no longer necessary. Clock trees
could have more than one parent anyway, so the existing code was not
completely correct anyway.

Link: https://patch.msgid.link/20260710-mtk-clk-parent-lookup-improvements-v2-19-f3f3a4a28dca@baylibre.com
Signed-off-by: David Lechner <dlechner@baylibre.com>

diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 9a1001ff93808753e293e23fb819e4c313a82f87..52d3428438afcdde60f2ef76f5a8a69c226fbca5 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -320,11 +320,6 @@ static int mtk_clk_mux_set_parent(void __iomem *base, u32 parent,
 }
 
 #if CONFIG_IS_ENABLED(CMD_CLK)
-static void mtk_clk_print_dev_parent(struct udevice *parent)
-{
-       printf("Parent device: %s %s\n", parent->driver->name, parent->name);
-}
-
 static void mtk_clk_print_mapped_id(int unmapped_id, int mapped_id, bool has_map)
 {
        /*
@@ -677,8 +672,6 @@ static void mtk_apmixedsys_dump(struct udevice *dev)
        const struct mtk_clk_tree *tree = priv->tree;
        u32 i;
 
-       mtk_clk_print_dev_parent(priv->parent);
-
        for (i = 0; i < tree->num_plls; i++) {
                const struct mtk_pll_data *pll = &tree->plls[i];
 
@@ -883,8 +876,6 @@ static void mtk_topckgen_dump(struct udevice *dev)
        const struct mtk_clk_tree *tree = priv->tree;
        u32 i;
 
-       mtk_clk_print_dev_parent(priv->parent);
-
        for (i = 0; i < tree->num_fclks; i++) {
                const struct mtk_fixed_clk *fclk = &tree->fclks[i];
 
@@ -1019,8 +1010,6 @@ static void mtk_infrasys_dump(struct udevice *dev)
        const struct mtk_clk_tree *tree = priv->tree;
        u32 i;
 
-       mtk_clk_print_dev_parent(priv->parent);
-
        for (i = 0; i < tree->num_fdivs; i++) {
                const struct mtk_fixed_factor *fdiv = &tree->fdivs[i];
 
@@ -1122,8 +1111,6 @@ static void mtk_clk_gate_dump(struct udevice *dev)
        const struct mtk_clk_tree *tree = priv->tree;
        u32 i;
 
-       mtk_clk_print_dev_parent(priv->parent);
-
        for (i = 0; i < priv->num_gates; i++) {
                const struct mtk_gate *gate = &priv->gates[i];
 
@@ -1200,43 +1187,23 @@ int mtk_common_clk_parent_bind(struct udevice *dev)
        return 0;
 }
 
-static int mtk_common_clk_init_drv(struct udevice *dev,
-                                  const struct mtk_clk_tree *tree,
-                                  const struct driver *drv)
+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, drv, &parent);
-               if (ret || !parent)
-                       return -ENOENT;
-       }
-
-       priv->parent = parent;
        priv->tree = tree;
 
        return mtk_clk_tree_register_provider(dev, tree);
 }
 
-int mtk_common_clk_init(struct udevice *dev,
-                       const struct mtk_clk_tree *tree)
-{
-       return mtk_common_clk_init_drv(dev, tree,
-                                      DM_DRIVER_GET(mtk_clk_apmixedsys));
-}
-
 int mtk_common_clk_infrasys_init(struct udevice *dev,
                                 const struct mtk_clk_tree *tree)
 {
-       return mtk_common_clk_init_drv(dev, tree,
-                                      DM_DRIVER_GET(mtk_clk_topckgen));
+       return mtk_common_clk_init(dev, tree);
 }
 
 int mtk_common_clk_gate_init(struct udevice *dev,
@@ -1245,22 +1212,11 @@ int mtk_common_clk_gate_init(struct udevice *dev,
                             int gates_offs)
 {
        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;
        priv->num_gates = num_gates;

diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index ce0685b830e995db79fd6507fb23e24677b92cd5..2993dc35efb5fe8c21e5ec0e6e559db390d55299 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -280,13 +280,11 @@ 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;