target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch

   1 From 1ce8667062bc7b8813adf6103ad2374d9dd52fb0 Mon Sep 17 00:00:00 2001
   2 From: Jean-Francois Moine <moinejf@free.fr>
   3 Date: Mon, 25 Nov 2013 19:47:04 +0100
   4 Subject: [PATCH 163/182] clk: return probe defer when DT clock not yet ready
   5
   6 At probe time, a clock device may not be ready when some other device
   7 wants to use it.
   8
   9 This patch lets the functions clk_get/devm_clk_get return a probe defer
  10 when the clock is defined in the DT but not yet available.
  11
  12 Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
  13 Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
  14 Tested-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
  15 Signed-off-by: Mike Turquette <mturquette@linaro.org>
  16 ---
  17  drivers/clk/clk.c    |    2 +-
  18  drivers/clk/clkdev.c |    2 ++
  19  2 files changed, 3 insertions(+), 1 deletion(-)
  20
  21 diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
  22 index 0582068..a3facad 100644
  23 --- a/drivers/clk/clk.c
  24 +++ b/drivers/clk/clk.c
  25 @@ -2502,7 +2502,7 @@ EXPORT_SYMBOL_GPL(of_clk_del_provider);
  26  struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec)
  27  {
  28         struct of_clk_provider *provider;
  29 -       struct clk *clk = ERR_PTR(-ENOENT);
  30 +       struct clk *clk = ERR_PTR(-EPROBE_DEFER);
  31
  32         /* Check if we have such a provider in our array */
  33         list_for_each_entry(provider, &of_clk_providers, link) {
  34 diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
  35 index 48f6721..a360b2e 100644
  36 --- a/drivers/clk/clkdev.c
  37 +++ b/drivers/clk/clkdev.c
  38 @@ -167,6 +167,8 @@ struct clk *clk_get(struct device *dev, const char *con_id)
  39                 clk = of_clk_get_by_name(dev->of_node, con_id);
  40                 if (!IS_ERR(clk))
  41                         return clk;
  42 +               if (PTR_ERR(clk) == -EPROBE_DEFER)
  43 +                       return clk;
  44         }
  45
  46         return clk_get_sys(dev_id, con_id);
  47 --
  48 1.7.10.4
  49