Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d9981ef authored by Jerome Brunet's avatar Jerome Brunet Committed by Neil Armstrong
Browse files

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: default avatarJerome Brunet <jbrunet@baylibre.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://lkml.kernel.org/r/20181221160239.26265-3-jbrunet@baylibre.com
parent 83d0ea23

drivers/clk/meson/meson-aoclk.c

+10 −5
Original line number Diff line number Diff line
@@ -65,16 +65,21 @@ 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,

		(void *) data->hw_data);