From: Neil Armstrong <narmstrong@baylibre.com>
To: stable@vger.kernel.org
Cc: khilman@baylibre.com, linux-amlogic@lists.infradead.org,
jbrunet@baylibre.com, linux-clk@vger.kernel.org,
Neil Armstrong <narmstrong@baylibre.com>
Subject: [PATCH stable 5.0] Revert "clk: meson: clean-up clock registration"
Date: Thu, 11 Apr 2019 12:11:32 +0200 [thread overview]
Message-ID: <20190411101132.5513-1-narmstrong@baylibre.com> (raw)
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
next reply other threads:[~2019-04-11 10:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-11 10:11 Neil Armstrong [this message]
2019-04-11 14:40 ` [PATCH stable 5.0] Revert "clk: meson: clean-up clock registration" Sasha Levin
2019-04-11 15:17 ` Jerome Brunet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190411101132.5513-1-narmstrong@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=jbrunet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).