From c9e1df54c52869a96a391763761a32fa2038141f Mon Sep 17 00:00:00 2001 From: Jacky Bai Date: Tue, 30 Apr 2019 15:16:29 +0800 Subject: [PATCH] clk: imx: Add uart from osc support on imx6ul/ull Add 'uart_from_osc' support on i.MX6UL/ULL. Signed-off-by: Jacky Bai [ Aisheng: update to CLK HW APIs ] Signed-off-by: Dong Aisheng --- drivers/clk/imx/clk-imx6ul.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index bc931988fe7b..6c0a8e0a7ef4 100644 --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -495,6 +495,12 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) clk_set_rate(hws[IMX6UL_CLK_ENET2_REF]->clk, 50000000); clk_set_rate(hws[IMX6UL_CLK_CSI]->clk, 24000000); + /* Set the UART parent if needed */ + if (uart_from_osc) + clk_set_parent(hws[IMX6UL_CLK_UART_SEL]->clk, hws[IMX6UL_CLK_OSC]->clk); + else + clk_set_parent(hws[IMX6UL_CLK_UART_SEL]->clk, hws[IMX6UL_CLK_PLL3_80M]->clk); + if (clk_on_imx6ull()) clk_prepare_enable(hws[IMX6UL_CLK_AIPSTZ3]->clk);