Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5746752 authored by Stefan Agner's avatar Stefan Agner Committed by Greg Kroah-Hartman
Browse files

clk: imx6ull: use OSC clock during AXI rate change 



[ Upstream commit 2e5be528ab0182ad4b42b9feea3b80f85f37179b ]

On i.MX6 ULL using PLL3 seems to cause a freeze when setting
the parent to IMX6UL_CLK_PLL3_USB_OTG. This only seems to appear
since commit 6f9575e55632 ("clk: imx: Add CLK_IS_CRITICAL flag
for busy divider and busy mux"), probably because the clock is
now forced to be on.

Fixes: 6f9575e55632("clk: imx: Add CLK_IS_CRITICAL flag for busy divider and busy mux")
Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0c5dfa51

drivers/clk/imx/clk-imx6ul.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) 
	clk_set_rate(clks[IMX6UL_CLK_AHB], 99000000);



	/* Change periph_pre clock to pll2_bus to adjust AXI rate to 264MHz */

	clk_set_parent(clks[IMX6UL_CLK_PERIPH_CLK2_SEL], clks[IMX6UL_CLK_PLL3_USB_OTG]);

	clk_set_parent(clks[IMX6UL_CLK_PERIPH_CLK2_SEL], clks[IMX6UL_CLK_OSC]);

	clk_set_parent(clks[IMX6UL_CLK_PERIPH], clks[IMX6UL_CLK_PERIPH_CLK2]);

	clk_set_parent(clks[IMX6UL_CLK_PERIPH_PRE], clks[IMX6UL_CLK_PLL2_BUS]);

	clk_set_parent(clks[IMX6UL_CLK_PERIPH], clks[IMX6UL_CLK_PERIPH_PRE]);