Merge branch 'clk-actions' into clk-next

* clk-actions:
  clk: actions: Add S900 SoC clock support
  clk: actions: Add pll clock support
  clk: actions: Add composite clock support
  clk: actions: Add fixed factor clock support
  clk: actions: Add factor clock support
  clk: actions: Add divider clock support
  clk: actions: Add mux clock support
  clk: actions: Add gate clock support
  clk: actions: Add common clock driver support
  dt-bindings: clock: Add Actions S900 clock bindings

diff --cc drivers/clk/Kconfig
index 41492e9,6313a4f..24a5bc3
--- 1/drivers/clk/Kconfig
--- 2/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -259,26 -238,7 +259,27 @@@ config COMMON_CLK_VC
          This driver supports the IDT VersaClock 5 and VersaClock 6
          programmable clock generators.
  
 +config COMMON_CLK_STM32MP157
 +      def_bool COMMON_CLK && MACH_STM32MP157
 +      help
 +      ---help---
 +        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
 +      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
 +      help
 +      ---help---
 +        Support for stm32h7 SoC family clocks
 +
+ source "drivers/clk/actions/Kconfig"
  source "drivers/clk/bcm/Kconfig"
  source "drivers/clk/hisilicon/Kconfig"
  source "drivers/clk/imgtec/Kconfig"

diff --cc drivers/clk/Makefile
Simple merge