Merge branch 'clk-ingenic-jz4725b' into clk-next

  - Ingenic jz4725b CGU

* clk-ingenic-jz4725b:
  clk: Add Ingenic jz4725b CGU driver
  dt-bindings: clock: Add jz4725b-cgu.h header
  dt-bindings: clock: ingenic: Explicitly list compatible strings
  clk: ingenic: Add proper Kconfig entries

diff --cc drivers/clk/Makefile
index ed344eb717cc440dd1c5cbbd2c4daccba3e7691e,b3bdcd1c15c49f54f5df682c381f60dcb1ec7c9e..b49d54fc05997ee1bf41ca01a45c00a8c7956cae
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -72,8 -72,7 +72,8 @@@ obj-$(CONFIG_H8300)                   += h8300
  obj-$(CONFIG_ARCH_HISI)                       += hisilicon/
  obj-y                                 += imgtec/
  obj-$(CONFIG_ARCH_MXC)                        += imx/
- obj-$(CONFIG_MACH_INGENIC)            += ingenic/
+ obj-y                                 += ingenic/
 +obj-$(CONFIG_ARCH_K3)                 += keystone/
  obj-$(CONFIG_ARCH_KEYSTONE)           += keystone/
  obj-$(CONFIG_MACH_LOONGSON32)         += loongson1/
  obj-y                                 += mediatek/