releases/4.19.35/revert-clk-meson-clean-up-clock-registration.patch

   1 From f471faf0251d0b8660d0a4c9f8f709183054bbca Mon Sep 17 00:00:00 2001
   2 From: Neil Armstrong <narmstrong@baylibre.com>
   3 Date: Thu, 11 Apr 2019 12:11:22 +0200
   4 Subject: Revert "clk: meson: clean-up clock registration"
   5
   6 This reverts commit c8e4f8406842332fb55cd792016e5dac266f6354.
   7
   8 This patch was not initially a fix and is dependent on other
   9 changes which are not fixes eithers.
  10
  11 With this change, multiple Amlogic based boards fails to boot,
  12 as reported by kernelci.
  13
  14 Cc: stable@vger.kernel.org # 4.19.34
  15 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
  16 Signed-off-by: Sasha Levin <sashal@kernel.org>
  17 ---
  18  drivers/clk/meson/meson-aoclk.c | 15 +++++----------
  19  1 file changed, 5 insertions(+), 10 deletions(-)
  20
  21 diff --git a/drivers/clk/meson/meson-aoclk.c b/drivers/clk/meson/meson-aoclk.c
  22 index 258c8d259ea1..f965845917e3 100644
  23 --- a/drivers/clk/meson/meson-aoclk.c
  24 +++ b/drivers/clk/meson/meson-aoclk.c
  25 @@ -65,20 +65,15 @@ int meson_aoclkc_probe(struct platform_device *pdev)
  26                 return ret;
  27         }
  28
  29 -       /* Populate regmap */
  30 -       for (clkid = 0; clkid < data->num_clks; clkid++)
  31 +       /*
  32 +        * Populate regmap and register all clks
  33 +        */
  34 +       for (clkid = 0; clkid < data->num_clks; clkid++) {
  35                 data->clks[clkid]->map = regmap;
  36
  37 -       /* Register all clks */
  38 -       for (clkid = 0; clkid < data->hw_data->num; clkid++) {
  39 -               if (!data->hw_data->hws[clkid])
  40 -                       continue;
  41 -
  42                 ret = devm_clk_hw_register(dev, data->hw_data->hws[clkid]);
  43 -               if (ret) {
  44 -                       dev_err(dev, "Clock registration failed\n");
  45 +               if (ret)
  46                         return ret;
  47 -               }
  48         }
  49
  50         return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get,
  51 --
  52 2.19.1
  53