lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.14 31/84] clk: ti: clkctrl: add support for retrying failed init
    Date
    From: Tero Kristo <t-kristo@ti.com>

    [ Upstream commit 729e13bf58e643b9accd2a14c55b555958702fb0 ]

    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>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/clk/ti/clkctrl.c | 12 +++++++++++-
    1 file changed, 11 insertions(+), 1 deletion(-)

    diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c
    index 53e71d0503ec..e7c51bea97f7 100644
    --- a/drivers/clk/ti/clkctrl.c
    +++ b/drivers/clk/ti/clkctrl.c
    @@ -400,6 +400,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;
    @@ -411,6 +417,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);
    @@ -485,7 +492,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:
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 01:22    [W:4.085 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site