diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2015-09-21 18:54:00 +0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2015-09-26 06:58:53 +0200 |
| commit | 5c678cdd02f25398b4908638d672b134cff9d59c (patch) | |
| tree | 76f150d9e6a3a4b6834d85fa3e12c5b39335b8a4 /drivers/clk/imx/clk-imx31.c | |
| parent | clk: imx27: retain early UART clocks during kernel init (diff) | |
| download | linux-5c678cdd02f25398b4908638d672b134cff9d59c.tar.xz linux-5c678cdd02f25398b4908638d672b134cff9d59c.zip | |
clk: imx31: 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-imx31.c')
| -rw-r--r-- | drivers/clk/imx/clk-imx31.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c index 1f8383475bb3..5520e20eaceb 100644 --- a/drivers/clk/imx/clk-imx31.c +++ b/drivers/clk/imx/clk-imx31.c @@ -62,6 +62,16 @@ enum mx31_clks { static struct clk *clk[clk_max]; static struct clk_onecell_data clk_data; +static struct clk ** const uart_clks[] __initconst = { + &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; @@ -200,6 +210,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; |