clk: meson: clean-up clock registration

Order, ids and size  between the table of regmap clocks and the onecell
data table could be different.

Set regmap pointer in all the regmap clocks before starting the
registration using the onecell data, to make sure we don't
get into an incoherent situation.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://lkml.kernel.org/r/20181221160239.26265-3-jbrunet@baylibre.com

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