git.openwrt.org Git - openwrt/staging/dangole.git/blob

   1 From 5881d7a1df54ac9b0acf618d970737479b2f6721 Mon Sep 17 00:00:00 2001
   2 From: Martin Sperl <kernel@martin.sperl.org>
   3 Date: Fri, 2 Sep 2016 16:45:27 +0100
   4 Subject: [PATCH 022/454] Register the clocks early during the boot process, so
   5  that special/critical clocks can get enabled early on in the boot process
   6  avoiding the risk of disabling a clock, pll_divider or pll when a claiming
   7  driver fails to install propperly - maybe it needs to defer.
   8
   9 Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
  10 ---
  11  drivers/clk/bcm/clk-bcm2835.c | 15 +++++++++++++--
  12  1 file changed, 13 insertions(+), 2 deletions(-)
  13
  14 --- a/drivers/clk/bcm/clk-bcm2835.c
  15 +++ b/drivers/clk/bcm/clk-bcm2835.c
  16 @@ -2220,8 +2220,15 @@ static int bcm2835_clk_probe(struct plat
  17         if (ret)
  18                 return ret;
  19
  20 -       return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
  21 +       ret = of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get,
  22                                       &cprman->onecell);
  23 +       if (ret)
  24 +               return ret;
  25 +
  26 +       /* note that we have registered all the clocks */
  27 +       dev_dbg(dev, "registered %d clocks\n", asize);
  28 +
  29 +       return 0;
  30  }
  31
  32  static const struct of_device_id bcm2835_clk_of_match[] = {
  33 @@ -2238,7 +2245,11 @@ static struct platform_driver bcm2835_cl
  34         .probe          = bcm2835_clk_probe,
  35  };
  36
  37 -builtin_platform_driver(bcm2835_clk_driver);
  38 +static int __init __bcm2835_clk_driver_init(void)
  39 +{
  40 +       return platform_driver_register(&bcm2835_clk_driver);
  41 +}
  42 +core_initcall(__bcm2835_clk_driver_init);
  43
  44  MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
  45  MODULE_DESCRIPTION("BCM2835 clock driver");