[1/1] clk: imx6q: fix uart earlycon unwork

Commit Message

Aisheng Dong July 2, 2021, 8:54 a.m. UTC

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: [e-mail] # v5.10+
Fixes: 379c9a24cc23 ("clk: imx: Fix reparenting of UARTs not associated with stdout")
Signed-off-by: Dong Aisheng <[e-mail]>
---
 drivers/clk/imx/clk-imx6q.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Abel Vesa July 19, 2021, 10:39 a.m. UTC | #1

On 21-07-02 16:54:38, Dong Aisheng wrote:
> 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: [e-mail] # v5.10+
> Fixes: 379c9a24cc23 ("clk: imx: Fix reparenting of UARTs not associated with stdout")
> Signed-off-by: Dong Aisheng <[e-mail]>


Reviewed-by: Abel Vesa <[e-mail]>

Stephen, will you pick this up ?

> ---
>  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 496900de0b0b..de36f58d551c 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)
>  			       hws[IMX6QDL_CLK_PLL3_USB_OTG]->clk);
>  	}
>  
> -	imx_register_uart_clocks(1);
> +	imx_register_uart_clocks(2);
>  }
>  CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init);
> -- 
> 2.25.1
>

Stephen Boyd July 27, 2021, 8:51 p.m. UTC | #2

Quoting Abel Vesa (2021-07-19 03:39:31)
> On 21-07-02 16:54:38, Dong Aisheng wrote:
> > 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: [e-mail] # v5.10+
> > Fixes: 379c9a24cc23 ("clk: imx: Fix reparenting of UARTs not associated with stdout")
> > Signed-off-by: Dong Aisheng <[e-mail]>
> 
> 
> Reviewed-by: Abel Vesa <[e-mail]>
> 
> Stephen, will you pick this up ?
> 

Sure I can pick it up if you need me to pick it to fixes?

Abel Vesa July 28, 2021, 8:28 a.m. UTC | #3

On 21-07-27 13:51:10, Stephen Boyd wrote:
> Quoting Abel Vesa (2021-07-19 03:39:31)
> > On 21-07-02 16:54:38, Dong Aisheng wrote:
> > > 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: [e-mail] # v5.10+
> > > Fixes: 379c9a24cc23 ("clk: imx: Fix reparenting of UARTs not associated with stdout")
> > > Signed-off-by: Dong Aisheng <[e-mail]>
> > 
> > 
> > Reviewed-by: Abel Vesa <[e-mail]>
> > 
> > Stephen, will you pick this up ?
> > 
> 
> Sure I can pick it up if you need me to pick it to fixes?

Yes, please.

Thanks.

Stephen Boyd Aug. 6, 2021, 1:12 a.m. UTC | #4

Quoting Dong Aisheng (2021-07-02 01:54:38)
> 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: [e-mail] # v5.10+
> Fixes: 379c9a24cc23 ("clk: imx: Fix reparenting of UARTs not associated with stdout")
> Signed-off-by: Dong Aisheng <[e-mail]>
> ---

Applied to clk-fixes

Patch

diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index 496900de0b0b..de36f58d551c 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)
 			       hws[IMX6QDL_CLK_PLL3_USB_OTG]->clk);
 	}
 
-	imx_register_uart_clocks(1);
+	imx_register_uart_clocks(2);
 }
 CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init);