This is a note to let you know that I've just added the patch titled clk: imx: pll14xx: fix clk_pll14xx_wait_lock to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: clk-imx-pll14xx-fix-clk_pll14xx_wait_lock.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From c3a5fd15ed0c1494435e4e35fbee734ae46b5073 Mon Sep 17 00:00:00 2001 From: Peng Fan <peng.fan@xxxxxxx> Date: Mon, 9 Dec 2019 08:19:55 +0000 Subject: clk: imx: pll14xx: fix clk_pll14xx_wait_lock From: Peng Fan <peng.fan@xxxxxxx> commit c3a5fd15ed0c1494435e4e35fbee734ae46b5073 upstream. The usage of readl_poll_timeout is wrong, the 3rd parameter(cond) should be "val & LOCK_STATUS" not "val & LOCK_TIMEOUT_US", It is not check whether the pll locked, LOCK_STATUS reflects the mask, not LOCK_TIMEOUT_US. Fixes: 8646d4dcc7fb ("clk: imx: Add PLLs driver for imx8mm soc") Cc: <stable@xxxxxxxxxxxxxxx> Reviewed-by: Abel Vesa <abel.vesa@xxxxxxx> Signed-off-by: Peng Fan <peng.fan@xxxxxxx> Signed-off-by: Shawn Guo <shawnguo@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/clk/imx/clk-pll14xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/clk/imx/clk-pll14xx.c +++ b/drivers/clk/imx/clk-pll14xx.c @@ -153,7 +153,7 @@ static int clk_pll14xx_wait_lock(struct { u32 val; - return readl_poll_timeout(pll->base, val, val & LOCK_TIMEOUT_US, 0, + return readl_poll_timeout(pll->base, val, val & LOCK_STATUS, 0, LOCK_TIMEOUT_US); } Patches currently in stable-queue which might be from peng.fan@xxxxxxx are queue-5.4/clk-imx-pll14xx-fix-clk_pll14xx_wait_lock.patch queue-5.4/clk-imx-clk-composite-8m-add-lock-to-gate-mux.patch queue-5.4/cpufreq-avoid-leaving-stale-irq-work-items-during-cpu-offline.patch queue-5.4/clk-imx-clk-imx7ulp-add-missing-sentinel-of-ulp_div_table.patch