[v2,8/8] clk: imx7d: retain early UART clocks during kernel init

Commit Message

Lucas Stach Sept. 4, 2015, 4 p.m. UTC

Make sure to keep UART clocks enabled during kernel init if
earlyprintk or earlycon are active.

Signed-off-by: Lucas Stach <[e-mail]>
---
 drivers/clk/imx/clk-imx7d.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Patch

diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c
index 71f3a94b472c..2cc31b47209b 100644
--- a/drivers/clk/imx/clk-imx7d.c
+++ b/drivers/clk/imx/clk-imx7d.c
@@ -363,6 +363,15 @@  static const char *pll_video_bypass_sel[] = { "pll_video_main", "pll_video_main_
 
 static struct clk_onecell_data clk_data;
 
+static struct clk **uart_clks[] __initdata = { &clks[IMX7D_UART1_ROOT_CLK],
+					       &clks[IMX7D_UART2_ROOT_CLK],
+					       &clks[IMX7D_UART3_ROOT_CLK],
+					       &clks[IMX7D_UART4_ROOT_CLK],
+					       &clks[IMX7D_UART5_ROOT_CLK],
+					       &clks[IMX7D_UART6_ROOT_CLK],
+					       &clks[IMX7D_UART7_ROOT_CLK],
+					       NULL };
+
 static void __init imx7d_clocks_init(struct device_node *ccm_node)
 {
 	struct device_node *np;
@@ -856,5 +865,7 @@  static void __init imx7d_clocks_init(struct device_node *ccm_node)
 	/* set uart module clock's parent clock source that must be great then 80MHz */
 	clk_set_parent(clks[IMX7D_UART1_ROOT_SRC], clks[IMX7D_OSC_24M_CLK]);
 
+	imx_register_uart_clocks(uart_clks);
+
 }
 CLK_OF_DECLARE(imx7d, "fsl,imx7d-ccm", imx7d_clocks_init);