R0dn3yS/android_kernel_xiaomi_sm7250
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "clk: meson: clean-up clock registration"

Browse Source 
This reverts commit c8e4f84068.

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: stable@vger.kernel.org # 4.19.34
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Neil Armstrong 2019-04-11 12:11:22 +02:00 committed by Greg Kroah-Hartman
parent 3412671a78
commit 564f0391b7
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/clk/meson/meson-aoclk.c
View File

@ -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,