clk: imx6q: Do not reparent unregistered IMX6QDL_CLK_PERIPH2
Subsystems (3)
PATCH 1/1 clk: imx6q: Do not reparent unregistered IMX6QDL_CLK_PERIPH2
The clock is registered later then these two re-parentings
Signed-off-by Abel Vesa <[email protected]>
--- drivers/clk/imx/clk-imx6q.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/clk/imx/clk-imx6q.c +0 -8
@@ -291,12 +291,6 @@ static void mmdc_ch1_disable(void __iomem *ccm_base)clk_set_parent (clk[IMX6QDL_CLK_PERIPH2_CLK2_SEL ], clk[IMX6QDL_CLK_PLL3_USB_OTG ]); -/* -* Handshake with mmdc_ch1 module must be masked when changing -* periph2_clk_sel. -*/ -clk_set_parent (clk[IMX6QDL_CLK_PERIPH2 ], clk[IMX6QDL_CLK_PERIPH2_CLK2 ]); -/* Disable pll3_sw_clk by selecting the bypass clock source */ reg =readl_relaxed (ccm_base +CCM_CCSR ); reg |=CCSR_PLL3_SW_CLK_SEL ;
@@ -311,8 +305,6 @@ static void mmdc_ch1_reenable(void __iomem *ccm_base) reg =readl_relaxed (ccm_base +CCM_CCSR ); reg &= ~CCSR_PLL3_SW_CLK_SEL ;writel_relaxed (reg, ccm_base +CCM_CCSR ); - -clk_set_parent (clk[IMX6QDL_CLK_PERIPH2 ], clk[IMX6QDL_CLK_PERIPH2_PRE ]); }/*
Signature · 1 line
2.7.4
Quoted 2 lines · Abel Vesa
The clock is registered later then these two re-parentings
Ignore this patch. I'll send a patchset which has another fix for another case like this one (plus the fix for the typo).
The patchset is actually switching all the imx6 and imx7 clocks to clk_hw based API, but will include all the necessary fixes for that to work.
Quoted 34 lines
Signed-off-by Abel Vesa <[email protected]>--- drivers/clk/imx/clk-imx6q.c | 8 -------- 1 file changed, 8 deletions(-)drivers/clk/imx/clk-imx6q.c +0
-8@@ -291,12 +291,6 @@ static void mmdc_ch1_disable(void __iomem *ccm_base)clk_set_parent (clk[IMX6QDL_CLK_PERIPH2_CLK2_SEL ], clk[IMX6QDL_CLK_PLL3_USB_OTG ]); -/* -* Handshake with mmdc_ch1 module must be masked when changing -* periph2_clk_sel. -*/ -clk_set_parent (clk[IMX6QDL_CLK_PERIPH2 ], clk[IMX6QDL_CLK_PERIPH2_CLK2 ]); -/* Disable pll3_sw_clk by selecting the bypass clock source */ reg =readl_relaxed (ccm_base +CCM_CCSR ); reg |=CCSR_PLL3_SW_CLK_SEL ;@@ -311,8 +305,6 @@ static void mmdc_ch1_reenable(void __iomem *ccm_base) reg =readl_relaxed (ccm_base +CCM_CCSR ); reg &= ~CCSR_PLL3_SW_CLK_SEL ;writel_relaxed (reg, ccm_base +CCM_CCSR ); - -clk_set_parent (clk[IMX6QDL_CLK_PERIPH2 ], clk[IMX6QDL_CLK_PERIPH2_PRE ]); }/* Signature · 1 line
2.7.4