From: Stephen Boyd <sboyd@kernel.org>
Date: Thu, 18 Oct 2018 22:43:24 +0000 (-0700)
Subject: Merge branch 'clk-ingenic-jz4725b' into clk-next
X-Git-Tag: v5.4-rc1~2301^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19ef24654f2ef3f4392a8df431eccf8f42ac4878;p=platform%2Fkernel%2Flinux-rpi.git

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
---

19ef24654f2ef3f4392a8df431eccf8f42ac4878
diff --cc drivers/clk/Makefile
index ed344eb,b3bdcd1..b49d54f
--- a/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/