mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <>
	Ahmad Fatoum <>
Subject: [PATCH master] clk: imx6: fix PLL exception for i.MX6DQ revision 1.0
Date: Wed,  2 Feb 2022 20:55:24 +0100	[thread overview]
Message-ID: <> (raw)

cpu_is_mx6* and imx_silicon_revision access static variables only
initialized in imx_init(). Use the alternative functions instead, that
will always consult the hardware to determine the version.
This requires us to know beforehand that we run on an i.MX6, but this
is a given when probing the imx6-ccm driver.

Other instances of this issue were removed in 37bc313add40 ("clk: imx6:
fix use of cpu_is_mx6* before they are initialized"), but this instance
was reintroduced as part of b534f79112f0 ("clk: imx6: Fix procedure to
switch the parent of LDB_DI_CLK").

This change only affects i.MX6D/Q SoCs with exactly revision 1.0 and
aligns their behavior to that of the Linux clock driver.

Fixes: b534f79112f0 ("clk: imx6: Fix procedure to switch the parent of LDB_DI_CLK")
Signed-off-by: Ahmad Fatoum <>
 drivers/clk/imx/clk-imx6.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/imx/clk-imx6.c b/drivers/clk/imx/clk-imx6.c
index 6935a8e85292..e3afcf7858bb 100644
--- a/drivers/clk/imx/clk-imx6.c
+++ b/drivers/clk/imx/clk-imx6.c
@@ -60,8 +60,8 @@ static inline int cpu_mx6_is_plus(void)
 /* Audio/Video PLL post dividers don't work on i.MX6q revision 1.0 */
 static inline int cpu_has_working_video_pll_post_div(void) {
-	return !((cpu_is_mx6q() || cpu_is_mx6d()) &&
-		 imx_silicon_revision() == IMX_CHIP_REV_1_0);
+	return !((cpu_mx6_is_mx6q() || cpu_mx6_is_mx6d()) &&
+		 __imx6_cpu_revision() == IMX_CHIP_REV_1_0);
 /* i.MX6 Quad/Dual/DualLite/Solo are all affected */

barebox mailing list

             reply	other threads:[~2022-02-02 19:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-02 19:55 Ahmad Fatoum [this message]
2022-02-03 10:14 ` Sascha Hauer

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \

* 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