Messages in this thread Patch in this message | | | From | Christian Eggers <> | Subject | [PATCH 5/6] clk: imx6sx: disable gpmi_io clock before changing parent clock | Date | Tue, 25 Jan 2022 09:54:39 +0100 |
| |
gpmi_io clocks may have been enabled by the boot loader. All children of qspi2_clk_root must be gated in order to prevent glitches during parent change.
Signed-off-by: Christian Eggers <ceggers@arri.de> --- drivers/clk/imx/clk-imx6sx.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c index fc1bd23d4583..cf1c1fad45f9 100644 --- a/drivers/clk/imx/clk-imx6sx.c +++ b/drivers/clk/imx/clk-imx6sx.c @@ -546,8 +546,19 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) clk_set_parent(hws[IMX6SX_CLK_GPU_AXI_SEL]->clk, hws[IMX6SX_CLK_PLL3_PFD0]->clk); clk_set_parent(hws[IMX6SX_CLK_QSPI1_SEL]->clk, hws[IMX6SX_CLK_PLL2_BUS]->clk); - clk_set_parent(hws[IMX6SX_CLK_QSPI2_SEL]->clk, hws[IMX6SX_CLK_PLL2_BUS]->clk); imx_register_uart_clocks(2); + + /* + * gpmi_io clock may have been enabled by the boot loader. All children + * of qspi2_clk_root must be gated in order to prevent glitches during + * parent change. The task of re-enabling is left to the gpmi-nand + * driver. + */ + if (clk_hw_is_enabled(hws[IMX6SX_CLK_GPMI_IO])) { + clk_prepare_enable(hws[IMX6SX_CLK_GPMI_IO]->clk); + clk_disable_unprepare(hws[IMX6SX_CLK_GPMI_IO]->clk); + } + clk_set_parent(hws[IMX6SX_CLK_QSPI2_SEL]->clk, hws[IMX6SX_CLK_PLL2_BUS]->clk); } CLK_OF_DECLARE(imx6sx, "fsl,imx6sx-ccm", imx6sx_clocks_init); -- Christian Eggers Embedded software developer Arnold & Richter Cine Technik GmbH & Co. Betriebs KG Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918 Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477 Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
| |