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: Tero Kristo <t-kristo@ti.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org>

diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c
index 38dbcc1b7e2c175fb83892bb1947c374dc68e845..7d82fff25d5b1bb888ba779ba990d856fecf4cb6 100644 (file)
--- a/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@ -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: