* [PATCH stable 5.0] Revert "clk: meson: clean-up clock registration"
@ 2019-04-11 10:11 Neil Armstrong
2019-04-11 14:40 ` Sasha Levin
0 siblings, 1 reply; 3+ messages in thread
From: Neil Armstrong @ 2019-04-11 10:11 UTC (permalink / raw)
To: stable; +Cc: khilman, linux-amlogic, jbrunet, linux-clk, 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.
Cc: stable@vger.kernel.org # 5.0.7
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/clk/meson/meson-aoclk.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/clk/meson/meson-aoclk.c b/drivers/clk/meson/meson-aoclk.c
index 258c8d259ea1..f965845917e3 100644
--- a/drivers/clk/meson/meson-aoclk.c
+++ b/drivers/clk/meson/meson-aoclk.c
@@ -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,
--
2.21.0
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH stable 5.0] Revert "clk: meson: clean-up clock registration"
2019-04-11 10:11 [PATCH stable 5.0] Revert "clk: meson: clean-up clock registration" Neil Armstrong
@ 2019-04-11 14:40 ` Sasha Levin
2019-04-11 15:17 ` Jerome Brunet
0 siblings, 1 reply; 3+ messages in thread
From: Sasha Levin @ 2019-04-11 14:40 UTC (permalink / raw)
To: Neil Armstrong; +Cc: khilman, linux-amlogic, linux-clk, stable, jbrunet
On Thu, Apr 11, 2019 at 12:11:32PM +0200, Neil Armstrong wrote:
>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
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH stable 5.0] Revert "clk: meson: clean-up clock registration"
2019-04-11 14:40 ` Sasha Levin
@ 2019-04-11 15:17 ` Jerome Brunet
0 siblings, 0 replies; 3+ messages in thread
From: Jerome Brunet @ 2019-04-11 15:17 UTC (permalink / raw)
To: Sasha Levin, Neil Armstrong; +Cc: khilman, linux-clk, stable, linux-amlogic
On Thu, 2019-04-11 at 10:40 -0400, Sasha Levin wrote:
> On Thu, Apr 11, 2019 at 12:11:32PM +0200, Neil Armstrong wrote:
> > 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
>
> --
> Thanks,
> Sasha
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-11 15:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-11 10:11 [PATCH stable 5.0] Revert "clk: meson: clean-up clock registration" Neil Armstrong
2019-04-11 14:40 ` Sasha Levin
2019-04-11 15:17 ` Jerome Brunet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).