Commit 9b0f4304 authored by Jerome Brunet's avatar Jerome Brunet Committed by Greg Kroah-Hartman

clk: meson: clean-up clock registration

[ Upstream commit 8d9981ef ]

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's avatarJerome Brunet <>
Acked-by: Neil Armstrong's avatarNeil Armstrong <>
Signed-off-by: Neil Armstrong's avatarNeil Armstrong <>
Link: 's avatarSasha Levin <>
parent a644d2d2
......@@ -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])
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,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment