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 --combined drivers/clk/Kconfig
index 41492e980ef4c0deb4fd6f62020d76137c912b42,6313a4f4327a2342ac4d862677d902504af03b53..24a5bc3a2ddbf06921c84aa1a7edc38de2d7142b
--- 1/drivers/clk/Kconfig
--- 2/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -55,25 -55,13 +55,25 @@@ config COMMON_CLK_RK80
          by control register.
  
  config COMMON_CLK_HI655X
 -      tristate "Clock driver for Hi655x"
 -      depends on MFD_HI655X_PMIC || COMPILE_TEST
 +      tristate "Clock driver for Hi655x" if EXPERT
 +      depends on (MFD_HI655X_PMIC || COMPILE_TEST)
 +      depends on REGMAP
 +      default MFD_HI655X_PMIC
        ---help---
          This driver supports the hi655x PMIC clock. This
          multi-function device has one fixed-rate oscillator, clocked
          at 32KHz.
  
 +config COMMON_CLK_SCMI
 +      tristate "Clock driver controlled via SCMI interface"
 +      depends on ARM_SCMI_PROTOCOL || COMPILE_TEST
 +        ---help---
 +        This driver provides support for clocks that are controlled
 +        by firmware that implements the SCMI interface.
 +
 +        This driver uses SCMI Message Protocol to interact with the
 +        firmware providing all the clock controls.
 +
  config COMMON_CLK_SCPI
        tristate "Clock driver controlled via SCPI interface"
        depends on ARM_SCPI_PROTOCOL || COMPILE_TEST
@@@ -103,15 -91,6 +103,15 @@@ config COMMON_CLK_SI51
          This driver supports the Silicon Labs 514 programmable clock
          generator.
  
 +config COMMON_CLK_SI544
 +      tristate "Clock driver for SiLabs 544 devices"
 +      depends on I2C
 +      select REGMAP_I2C
 +      help
 +      ---help---
 +        This driver supports the Silicon Labs 544 programmable clock
 +        generator.
 +
  config COMMON_CLK_SI570
        tristate "Clock driver for SiLabs 570 and compatible devices"
        depends on I2C
@@@ -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 --combined drivers/clk/Makefile
index de6d06ac790b63eb90b6d2b04077750fd985d64c,b7909df532ed2d46f052e72a344e0086d054697d..35896e2ae95a5fca24b8573e49e25279162227e7
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -41,15 -41,12 +41,15 @@@ obj-$(CONFIG_CLK_QORIQ)                    += clk-qoriq.
  obj-$(CONFIG_COMMON_CLK_RK808)                += clk-rk808.o
  obj-$(CONFIG_COMMON_CLK_HI655X)               += clk-hi655x.o
  obj-$(CONFIG_COMMON_CLK_S2MPS11)      += clk-s2mps11.o
 +obj-$(CONFIG_COMMON_CLK_SCMI)           += clk-scmi.o
  obj-$(CONFIG_COMMON_CLK_SCPI)           += clk-scpi.o
  obj-$(CONFIG_COMMON_CLK_SI5351)               += clk-si5351.o
  obj-$(CONFIG_COMMON_CLK_SI514)                += clk-si514.o
 +obj-$(CONFIG_COMMON_CLK_SI544)                += clk-si544.o
  obj-$(CONFIG_COMMON_CLK_SI570)                += clk-si570.o
 -obj-$(CONFIG_ARCH_STM32)              += clk-stm32f4.o
 -obj-$(CONFIG_ARCH_STM32)              += clk-stm32h7.o
 +obj-$(CONFIG_COMMON_CLK_STM32F)               += clk-stm32f4.o
 +obj-$(CONFIG_COMMON_CLK_STM32H7)      += clk-stm32h7.o
 +obj-$(CONFIG_COMMON_CLK_STM32MP157)   += clk-stm32mp1.o
  obj-$(CONFIG_ARCH_TANGO)              += clk-tango4.o
  obj-$(CONFIG_CLK_TWL6040)             += clk-twl6040.o
  obj-$(CONFIG_ARCH_U300)                       += clk-u300.o
@@@ -59,12 -56,12 +59,13 @@@ obj-$(CONFIG_COMMON_CLK_WM831X)            += clk
  obj-$(CONFIG_COMMON_CLK_XGENE)                += clk-xgene.o
  
  # please keep this section sorted lexicographically by directory path name
+ obj-y                                 += actions/
  obj-$(CONFIG_COMMON_CLK_AT91)         += at91/
  obj-$(CONFIG_ARCH_ARTPEC)             += axis/
  obj-$(CONFIG_ARC_PLAT_AXS10X)         += axs10x/
  obj-y                                 += bcm/
  obj-$(CONFIG_ARCH_BERLIN)             += berlin/
 +obj-$(CONFIG_ARCH_DAVINCI)            += davinci/
  obj-$(CONFIG_H8300)                   += h8300/
  obj-$(CONFIG_ARCH_HISI)                       += hisilicon/
  obj-y                                 += imgtec/
@@@ -92,7 -89,6 +93,7 @@@ obj-$(CONFIG_ARCH_SOCFPGA)            += socfpga
  obj-$(CONFIG_PLAT_SPEAR)              += spear/
  obj-$(CONFIG_ARCH_SPRD)                       += sprd/
  obj-$(CONFIG_ARCH_STI)                        += st/
 +obj-$(CONFIG_ARCH_STRATIX10)          += socfpga/
  obj-$(CONFIG_ARCH_SUNXI)              += sunxi/
  obj-$(CONFIG_ARCH_SUNXI)              += sunxi-ng/
  obj-$(CONFIG_ARCH_TEGRA)              += tegra/