Quoting Weiyi Lu (2019-06-06 20:11:52)
> diff --git a/drivers/clk/mediatek/clk-mt8183.c b/drivers/clk/mediatek/clk-mt8183.c
> index 9d86510..a8f50bc 100644
> --- a/drivers/clk/mediatek/clk-mt8183.c
> +++ b/drivers/clk/mediatek/clk-mt8183.c
> @@ -1167,37 +1169,62 @@ static int clk_mt8183_apmixed_probe(struct platform_device *pdev)
> return of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
> }
>
> +static struct clk_onecell_data *top_clk_data;
> +
> +static void clk_mt8183_top_init_early(struct device_node *node)
> +{
> + int i;
> +
> + if (!top_clk_data) {
Is this function ever called more than once? I believe the answer is no
so this check should be removed.
> + top_clk_data = mtk_alloc_clk_data(CLK_TOP_NR_CLK);
> +
> + for (i = 0; i < CLK_TOP_NR_CLK; i++)
> + top_clk_data->clks[i] = ERR_PTR(-EPROBE_DEFER);
> + }
> +
> + mtk_clk_register_factors(top_early_divs, ARRAY_SIZE(top_early_divs),
> + top_clk_data);
> +
> + of_clk_add_provider(node, of_clk_src_onecell_get, top_clk_data);
> +}
> +
> +CLK_OF_DECLARE_DRIVER(mt8183_topckgen, "mediatek,mt8183-topckgen",
> + clk_mt8183_top_init_early);
> +
> static int clk_mt8183_top_probe(struct platform_device *pdev)
> {
> struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> void __iomem *base;
> - struct clk_onecell_data *clk_data;
> struct device_node *node = pdev->dev.of_node;
>
> base = devm_ioremap_resource(&pdev->dev, res);
> if (IS_ERR(base))
> return PTR_ERR(base);
>
> - clk_data = mtk_alloc_clk_data(CLK_TOP_NR_CLK);
> + if (!top_clk_data)
> + top_clk_data = mtk_alloc_clk_data(CLK_TOP_NR_CLK);
And then this can be removed because top_clk_data must be allocated at
this point.
