summary refs log tree commit diff
path: root/drivers/clk/imx
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2015-09-21 18:54:01 +0200
committerShawn Guo <shawnguo@kernel.org>2015-09-25 21:58:56 -0700
commit57d5a4c3ed001f813f1c8e1609db83c84d0e88cf (patch)
tree2b9f48fff56c9b94af12df5bb742ab9e0ada843b /drivers/clk/imx
parent5c678cdd02f25398b4908638d672b134cff9d59c (diff)
downloadlinux-57d5a4c3ed001f813f1c8e1609db83c84d0e88cf.tar.gz
clk: imx35: retain early UART clocks during kernel init
Make sure to keep UART clocks enabled during kernel init if
earlyprintk or earlycon are active.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'drivers/clk/imx')
-rw-r--r--drivers/clk/imx/clk-imx35.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c
index 76c463dcdb1c..a71d24cb4c06 100644
--- a/drivers/clk/imx/clk-imx35.c
+++ b/drivers/clk/imx/clk-imx35.c
@@ -84,6 +84,14 @@ enum mx35_clks {
 
 static struct clk *clk[clk_max];
 
+static struct clk ** const uart_clks[] __initconst = {
+	&clk[ipg],
+	&clk[uart1_gate],
+	&clk[uart2_gate],
+	&clk[uart3_gate],
+	NULL
+};
+
 static void __init _mx35_clocks_init(void)
 {
 	void __iomem *base;
@@ -237,6 +245,8 @@ static void __init _mx35_clocks_init(void)
 	 */
 	clk_prepare_enable(clk[scc_gate]);
 
+	imx_register_uart_clocks(uart_clks);
+
 	imx_print_silicon_rev("i.MX35", mx35_revision());
 }