Commit 7f294d10 authored by Alper Nebi Yasak's avatar Alper Nebi Yasak Committed by Stephen Boyd
Browse files

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: default avatarAlper Nebi Yasak <alpernebiyasak@gmail.com>
Link: https://lore.kernel.org/r/20240612201211.91683-1-alpernebiyasak@gmail.com


Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 9f7809c6

drivers/clk/mediatek/clk-mt8173-infracfg.c

+11 −1
Original line number Diff line number Diff line
@@ -98,7 +98,17 @@ CLK_OF_DECLARE_DRIVER(mtk_infrasys, "mediatek,mt8173-infracfg", 
static int clk_mt8173_infracfg_probe(struct platform_device *pdev)

{

	struct device_node *node = pdev->dev.of_node;

	int r;

	int r, i;



	if (!infra_clk_data) {

		infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR_CLK);

		if (!infra_clk_data)

			return -ENOMEM;

	} else {

		for (i = 0; i < CLK_INFRA_NR_CLK; i++)

			if (infra_clk_data->hws[i] == ERR_PTR(-EPROBE_DEFER))

				infra_clk_data->hws[i] = ERR_PTR(-ENOENT);

	}



	r = mtk_clk_register_gates(&pdev->dev, node, infra_gates,

				   ARRAY_SIZE(infra_gates), infra_clk_data);