Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 729e13bf authored by Tero Kristo's avatar Tero Kristo
Browse files

clk: ti: clkctrl: add support for retrying failed init 



In case the clkctrl node contains assigned-clock-* entries, registering
the provider can fail with -EPROBE_DEFER. In this case, add the
provider to the retry_init clock list so it will be cleaned up later.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Acked-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent ffb009b2

drivers/clk/ti/clkctrl.c

+11 −1
Original line number Diff line number Diff line
@@ -414,6 +414,12 @@ _ti_clkctrl_setup_subclks(struct omap_clkctrl_provider *provider, 
	}

}



static void __init _clkctrl_add_provider(void *data,

					 struct device_node *np)

{

	of_clk_add_hw_provider(np, _ti_omap4_clkctrl_xlate, data);

}



static void __init _ti_omap4_clkctrl_setup(struct device_node *node)

{

	struct omap_clkctrl_provider *provider;
@@ -425,6 +431,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) 
	struct omap_clkctrl_clk *clkctrl_clk;

	const __be32 *addrp;

	u32 addr;

	int ret;



	addrp = of_get_address(node, 0, NULL, NULL);

	addr = (u32)of_translate_address(node, addrp);
@@ -519,7 +526,10 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) 
		reg_data++;

	}



	of_clk_add_hw_provider(node, _ti_omap4_clkctrl_xlate, provider);

	ret = of_clk_add_hw_provider(node, _ti_omap4_clkctrl_xlate, provider);

	if (ret == -EPROBE_DEFER)

		ti_clk_retry_init(node, provider, _clkctrl_add_provider);



	return;



cleanup: