Revert "clk: meson: clean-up clock registration"
Subsystems (3)
PATCH 1/1 Revert "clk: meson: clean-up clock registration"
This reverts commit c8e4f8406842332fb55cd792016e5dac266f6354.
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 [email protected] # 4.19.34
Signed-off-by Neil Armstrong <[email protected]>
--- drivers/clk/meson/meson-aoclk.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/clk/meson/meson-aoclk.c +5 -10
@@ -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,
Signature · 1 line
2.21.0