diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2015-09-21 18:54:03 +0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2015-09-26 06:59:02 +0200 |
| commit | 0822f933735c1eee6adfc236c72f763f42ac0f3d (patch) | |
| tree | e75629660b00c3758d4cf4d7a9833e560cb643ce /drivers/clk/imx/clk-imx6q.c | |
| parent | clk: imx5: retain early UART clocks during kernel init (diff) | |
| download | linux-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-imx6q.c')
| -rw-r--r-- | drivers/clk/imx/clk-imx6q.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c index b2c1c047dc94..e9ba018ac6a3 100644 --- a/drivers/clk/imx/clk-imx6q.c +++ b/drivers/clk/imx/clk-imx6q.c @@ -130,6 +130,12 @@ static inline int clk_on_imx6dl(void) return of_machine_is_compatible("fsl,imx6dl"); } +static struct clk ** const uart_clks[] __initconst = { + &clk[IMX6QDL_CLK_UART_IPG], + &clk[IMX6QDL_CLK_UART_SERIAL], + NULL +}; + static void __init imx6q_clocks_init(struct device_node *ccm_node) { struct device_node *np; @@ -541,5 +547,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) /* All existing boards with PCIe use LVDS1 */ if (IS_ENABLED(CONFIG_PCI_IMX6)) clk_set_parent(clk[IMX6QDL_CLK_LVDS1_SEL], clk[IMX6QDL_CLK_SATA_REF_100M]); + + imx_register_uart_clocks(uart_clks); } CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init); |