Skip to contentSkip to conversation

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

PATCH Applied Neil Armstrong 3 participants 3 messages Apr 11, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "clk: meson: clean-up clock registration"

This reverts commit 9b0f430450cf230e736bc40f95bf34fbdb99cead.

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.

---
 drivers/clk/meson/meson-aoclk.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/clk/meson/meson-aoclk.c +5 -10
index 258c8d259ea1..f965845917e3 100644
@@ -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
maintainer Applied
#1 lore raw
Quoted 7 lines · Neil Armstrong

This reverts commit 9b0f430450cf230e736bc40f95bf34fbdb99cead.

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.

I've queued this and the 4.19 one, thanks and sorry for the breakage.

--
Thanks,
Sasha

reviewer
#2 lore raw
Quoted 10 lines · Sasha Levin
Quoted 7 lines · Neil Armstrong

This reverts commit 9b0f430450cf230e736bc40f95bf34fbdb99cead.

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.

I've queued this and the 4.19 one, thanks and sorry for the breakage.

We thought it would be harmless when it was proposed, so guess this one is on us ;)

Thanks for maintaining stable !!
Cheers

Quoted 4 lines

--
Thanks,
Sasha