Commit b79a08af authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'clk-meson-v6.7-2' of https://github.com/BayLibre/clk-meson into clk-amlogic 

Pull another amlogic clk driver update from Jerome Brunet:

 - Fix missing dependency for s4 clock controllers

* tag 'clk-meson-v6.7-2' of https://github.com/BayLibre/clk-meson:
  clk: meson: S4: select CONFIG_COMMON_CLK_MESON_CLKC_UTILS
parents 90cf94ed 98408df6

drivers/clk/meson/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ config COMMON_CLK_S4_PLL 
	tristate "S4 SoC PLL clock controllers support"

	depends on ARM64

	default y

	select COMMON_CLK_MESON_CLKC_UTILS

	select COMMON_CLK_MESON_MPLL

	select COMMON_CLK_MESON_PLL

	select COMMON_CLK_MESON_REGMAP
@@ -161,6 +162,7 @@ config COMMON_CLK_S4_PERIPHERALS 
	tristate "S4 SoC peripherals clock controllers support"

	depends on ARM64

	default y

	select COMMON_CLK_MESON_CLKC_UTILS

	select COMMON_CLK_MESON_REGMAP

	select COMMON_CLK_MESON_DUALDIV

	select COMMON_CLK_MESON_VID_PLL_DIV