Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: mediatek: mt8173-infracfg: Handle unallocated infracfg when module

The MT8173 infracfg clock driver does initialization in two steps, via a
CLK_OF_DECLARE_DRIVER declaration. However its early init function
doesn't get to run when it's built as a module, presumably since it's
not loaded by the time it would have been called by of_clk_init(). This
causes its second-step probe() to return -ENOMEM when trying to register
clocks, as the necessary clock_data struct isn't initialized by the
first step.

MT2701 and MT6797 clock drivers also use this mechanism, but they try to
allocate the necessary clock_data structure if missing in the second
step. Mimic that for the MT8173 infracfg clock as well to make it work
as a module.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Link: https://lore.kernel.org/r/20240612201211.91683-1-alpernebiyasak@gmail.com
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Alper Nebi Yasak and committed by
Stephen Boyd
7f294d10 9f7809c6

+11 -1
+11 -1
drivers/clk/mediatek/clk-mt8173-infracfg.c
··· 98 98 static int clk_mt8173_infracfg_probe(struct platform_device *pdev) 99 99 { 100 100 struct device_node *node = pdev->dev.of_node; 101 - int r; 101 + int r, i; 102 + 103 + if (!infra_clk_data) { 104 + infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR_CLK); 105 + if (!infra_clk_data) 106 + return -ENOMEM; 107 + } else { 108 + for (i = 0; i < CLK_INFRA_NR_CLK; i++) 109 + if (infra_clk_data->hws[i] == ERR_PTR(-EPROBE_DEFER)) 110 + infra_clk_data->hws[i] = ERR_PTR(-ENOENT); 111 + } 102 112 103 113 r = mtk_clk_register_gates(&pdev->dev, node, infra_gates, 104 114 ARRAY_SIZE(infra_gates), infra_clk_data);