Commit c8e4f840 authored Dec 21, 2018 by Jerome Brunet Committed by Greg Kroah-Hartman Apr 05, 2019

clk: meson: clean-up clock registration



[ Upstream commit 8d9981efbcab066d17af4d3c85c169200f6f78df ]

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


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 6251c1db

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);