From mboxrd@z Thu Jan 1 00:00:00 1970 From: l.stach@pengutronix.de (Lucas Stach) Date: Fri, 4 Sep 2015 18:00:15 +0200 Subject: [PATCH v2 4/8] clk: imx31: retain early UART clocks during kernel init In-Reply-To: <1441382419-4343-1-git-send-email-l.stach@pengutronix.de> References: <1441382419-4343-1-git-send-email-l.stach@pengutronix.de> Message-ID: <1441382419-4343-5-git-send-email-l.stach@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Make sure to keep UART clocks enabled during kernel init if earlyprintk or earlycon are active. Signed-off-by: Lucas Stach --- drivers/clk/imx/clk-imx31.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c index fe66c40b7be2..cd38bffc8041 100644 --- a/drivers/clk/imx/clk-imx31.c +++ b/drivers/clk/imx/clk-imx31.c @@ -62,6 +62,14 @@ enum mx31_clks { static struct clk *clk[clk_max]; static struct clk_onecell_data clk_data; +static struct clk **uart_clks[] __initdata = { &clk[ipg], + &clk[uart1_gate], + &clk[uart2_gate], + &clk[uart3_gate], + &clk[uart4_gate], + &clk[uart5_gate], + NULL }; + int __init mx31_clocks_init(unsigned long fref) { void __iomem *base; @@ -199,6 +207,8 @@ int __init mx31_clocks_init(unsigned long fref) mx31_revision(); clk_disable_unprepare(clk[iim_gate]); + imx_register_uart_clocks(uart_clks); + mxc_timer_init(MX31_GPT1_BASE_ADDR, MX31_INT_GPT, GPT_TYPE_IMX31); return 0; -- 2.5.0