[PATCH 19/24] clk: mediatek: drop parent udevice field

[Julien Stephan]

Le mar. 7 juil. 2026 à 17:10, David Lechner <dlechner at baylibre.com> a écrit :
>
> Remove the parent field from the mediatek clock private data structures.
> This was no longer used other than debug prints.
>

Hi David,

Looks like this commit is breaking mmc on me Genio 700 board.

  Card did not respond to voltage select! : -5

And then it fails to boot.
clk dump output is equivalent to what I used to have on my Genio 700
(without the parent debug print)

One more minor comment inline below

Cheers
Julien

> Signed-off-by: David Lechner <dlechner at baylibre.com>
> ---
>  drivers/clk/mediatek/clk-mtk.c | 47 ++----------------------------------------
>  drivers/clk/mediatek/clk-mtk.h |  2 --
>  2 files changed, 2 insertions(+), 47 deletions(-)
>
> diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
> index d1cfa70e5a6..0afd94ed4ef 100644
> --- 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];
>
> @@ -1189,43 +1176,24 @@ const struct clk_ops mtk_clk_gate_ops = {
>  #endif
>  };
>
> -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;

ret is now unused

>
>         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,
> @@ -1234,22 +1202,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 10df7571c9f..b9b9360b4bd 100644
> --- a/drivers/clk/mediatek/clk-mtk.h
> +++ b/drivers/clk/mediatek/clk-mtk.h
> @@ -275,13 +275,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;
>
> --
> 2.43.0
>