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

Commit f65cfecf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull clk fixes from Stephen Boyd:

 - a modified revert of a patch that made new choices come out for a
   couple stm32 clk drivers that really always need to be there when
   that particular machine is compiled in

 - boot fix on i.MX for Stefan who noticed odd behavior from the
   critical flag patch that came in during the merge window

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: stm32: fix: stm32 clock drivers are not compiled by default
  clk: imx6ull: use OSC clock during AXI rate change
parents 6d16db00 9a160601

drivers/clk/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -266,15 +266,13 @@ config COMMON_CLK_STM32MP157 
	  Support for stm32mp157 SoC family clocks



config COMMON_CLK_STM32F

	bool "Clock driver for stm32f4 and stm32f7 SoC families"

	depends on MACH_STM32F429 || MACH_STM32F469 || MACH_STM32F746

	def_bool COMMON_CLK && (MACH_STM32F429 || MACH_STM32F469 || MACH_STM32F746)

	help

	---help---

	  Support for stm32f4 and stm32f7 SoC families clocks



config COMMON_CLK_STM32H7

	bool "Clock driver for stm32h7 SoC family"

	depends on MACH_STM32H743

	def_bool COMMON_CLK && MACH_STM32H743

	help

	---help---

	  Support for stm32h7 SoC family clocks

drivers/clk/imx/clk-imx6ul.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,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]);