[PATCH 5.10 76/98] clk: imx6q: fix uart earlycon unwork

From: Sasha Levin
Date: Tue Aug 24 2021 - 13:11:48 EST

From: Dong Aisheng <aisheng.dong@xxxxxxx>

[ Upstream commit 283f1b9a0401859c53fdd6483ab66f1c4fadaea5 ]

The earlycon depends on the bootloader setup UART clocks being retained.
There're actually two uart clocks (ipg, per) on MX6QDL,
but the 'Fixes' commit change to register only one which means
another clock may be disabled during booting phase
and result in the earlycon unwork.

Cc: stable@xxxxxxxxxxxxxxx # v5.10+
Fixes: 379c9a24cc23 ("clk: imx: Fix reparenting of UARTs not associated with stdout")
Signed-off-by: Dong Aisheng <aisheng.dong@xxxxxxx>
Link: https://lore.kernel.org/r/20210702085438.1988087-1-aisheng.dong@xxxxxxx
Reviewed-by: Abel Vesa <abel.vesa@xxxxxxx>
Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
drivers/clk/imx/clk-imx6q.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index f444bbe8244c..7d07dd92a7b4 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -974,6 +974,6 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)

- imx_register_uart_clocks(1);
+ imx_register_uart_clocks(2);
CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init);