summaryrefslogtreecommitdiffstats
path: root/drivers/clk/imx/clk-imx6sx.c
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2015-09-21 18:54:03 +0200
committerShawn Guo <shawnguo@kernel.org>2015-09-26 06:59:02 +0200
commit0822f933735c1eee6adfc236c72f763f42ac0f3d (patch)
treee75629660b00c3758d4cf4d7a9833e560cb643ce /drivers/clk/imx/clk-imx6sx.c
parentclk: imx5: retain early UART clocks during kernel init (diff)
downloadlinux-0822f933735c1eee6adfc236c72f763f42ac0f3d.tar.xz
linux-0822f933735c1eee6adfc236c72f763f42ac0f3d.zip
clk: imx6: 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/clk-imx6sx.c')
-rw-r--r--drivers/clk/imx/clk-imx6sx.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c
index 5b95c2c2bf52..f0ad8bbc12f8 100644
--- a/drivers/clk/imx/clk-imx6sx.c
+++ b/drivers/clk/imx/clk-imx6sx.c
@@ -135,6 +135,12 @@ static u32 share_count_ssi1;
static u32 share_count_ssi2;
static u32 share_count_ssi3;
+static struct clk ** const uart_clks[] __initconst = {
+ &clks[IMX6SX_CLK_UART_IPG],
+ &clks[IMX6SX_CLK_UART_SERIAL],
+ NULL
+};
+
static void __init imx6sx_clocks_init(struct device_node *ccm_node)
{
struct device_node *np;
@@ -557,5 +563,7 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node)
clk_set_parent(clks[IMX6SX_CLK_QSPI1_SEL], clks[IMX6SX_CLK_PLL2_BUS]);
clk_set_parent(clks[IMX6SX_CLK_QSPI2_SEL], clks[IMX6SX_CLK_PLL2_BUS]);
+
+ imx_register_uart_clocks(uart_clks);
}
CLK_OF_DECLARE(imx6sx, "fsl,imx6sx-ccm", imx6sx_clocks_init);