Revert "clk: meson: clean-up clock registration"

This reverts commit 9b0f430450cf230e736bc40f95bf34fbdb99cead.

This patch was not initially a fix and is dependent on other
changes which are not fixes eithers.

With this change, multiple Amlogic based boards fails to boot,
as reported by kernelci.

Cc: stable@vger.kernel.org # 5.0.7
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/clk/meson/meson-aoclk.c b/drivers/clk/meson/meson-aoclk.c
index 258c8d259ea142b15520b9b2c178005a313302e0..f965845917e3438d2994e20a3f6a1ca1bcdebaaa 100644 (file)
--- a/drivers/clk/meson/meson-aoclk.c
+++ b/drivers/clk/meson/meson-aoclk.c
@@ -65,20 +65,15 @@ int meson_aoclkc_probe(struct platform_device *pdev)
                return ret;
        }
 
-       /* Populate regmap */
-       for (clkid = 0; clkid < data->num_clks; clkid++)
+       /*
+        * Populate regmap and register all clks
+        */
+       for (clkid = 0; clkid < data->num_clks; clkid++) {
                data->clks[clkid]->map = regmap;
 
-       /* Register all clks */
-       for (clkid = 0; clkid < data->hw_data->num; clkid++) {
-               if (!data->hw_data->hws[clkid])
-                       continue;
-
                ret = devm_clk_hw_register(dev, data->hw_data->hws[clkid]);
-               if (ret) {
-                       dev_err(dev, "Clock registration failed\n");
+               if (ret)
                        return ret;
-               }
        }
 
        return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get,