Merge branch 'clk-next-hi6220' into clk-next

Conflicts:
	drivers/clk/Kconfig

diff --cc drivers/clk/Kconfig
index e33ff4e3e18daab4c8ef9c0c83a3f6ebd594992b,8ec04156717b792f5ca5451123f853cb264ed6fe..1dd4f9d8bcb6b81227aaaa686157bf200531800d
--- 1/drivers/clk/Kconfig
--- 2/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -167,7 -150,7 +167,8 @@@ config COMMON_CLK_CDCE70
        ---help---
          This driver supports TI CDCE706 programmable 3-PLL clock synthesizer.
  
 +source "drivers/clk/bcm/Kconfig"
+ source "drivers/clk/hisilicon/Kconfig"
  source "drivers/clk/qcom/Kconfig"
  
  endmenu

diff --cc drivers/clk/Makefile
index 00ae2de0803a86f73f166a98f12a7e1898a986f3,97199542886108fe4970e5ca0062141f32f6b9d1..a4b9b5f4a0912d54b4184a2dcbccbf6fade07533
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -48,11 -47,8 +48,9 @@@ obj-$(CONFIG_COMMON_CLK_PWM)         += clk-pw
  obj-$(CONFIG_COMMON_CLK_AT91)         += at91/
  obj-$(CONFIG_ARCH_BCM_MOBILE)         += bcm/
  obj-$(CONFIG_ARCH_BERLIN)             += berlin/
- obj-$(CONFIG_ARCH_HI3xxx)             += hisilicon/
- obj-$(CONFIG_ARCH_HIP04)              += hisilicon/
- obj-$(CONFIG_ARCH_HIX5HD2)            += hisilicon/
+ obj-$(CONFIG_ARCH_HISI)                       += hisilicon/
  obj-$(CONFIG_COMMON_CLK_KEYSTONE)     += keystone/
 +obj-$(CONFIG_ARCH_MEDIATEK)           += mediatek/
  ifeq ($(CONFIG_COMMON_CLK), y)
  obj-$(CONFIG_ARCH_MMP)                        += mmp/
  endif