Merge tag 'sunxi-clocks-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git...

Bringing in the sunxi clock branch since it introduces header file contents
that is needed by the DT branch. This is a stable tag shared with the clk tree.

Allwinner clock additions for 4.4

  - Support for the Audio PLL and child clocks
  - Support for the A33 AHB gates
  - New clk-multiplier generic driver

* tag 'sunxi-clocks-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  clk: sunxi: mod1 clock support
  clk: sunxi: codec clock support
  clk: sunxi: pll2: Add A13 support
  clk: sunxi: Add a driver for the PLL2
  clk: Add a basic multiplier clock
  clk: sunxi: Add A33 gates support

Signed-off-by: Olof Johansson <[email protected]>

diff --combined drivers/clk/Makefile
index 9f71558553915f29c3c58c0cb38bb21576bdaabb,0b2101039508001a081abc95112dcf26e48214d1..0066a06abbf36fe420f54b92f486077bce046fcb
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -6,6 -6,7 +6,7 @@@ obj-$(CONFIG_COMMON_CLK) += clk-divider
  obj-$(CONFIG_COMMON_CLK)      += clk-fixed-factor.o
  obj-$(CONFIG_COMMON_CLK)      += clk-fixed-rate.o
  obj-$(CONFIG_COMMON_CLK)      += clk-gate.o
+ obj-$(CONFIG_COMMON_CLK)      += clk-multiplier.o
  obj-$(CONFIG_COMMON_CLK)      += clk-mux.o
  obj-$(CONFIG_COMMON_CLK)      += clk-composite.o
  obj-$(CONFIG_COMMON_CLK)      += clk-fractional-divider.o
@@@ -19,6 -20,7 +20,6 @@@ endi
  obj-$(CONFIG_MACH_ASM9260)            += clk-asm9260.o
  obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN)   += clk-axi-clkgen.o
  obj-$(CONFIG_ARCH_AXXIA)              += clk-axm5516.o
 -obj-$(CONFIG_ARCH_BCM2835)            += clk-bcm2835.o
  obj-$(CONFIG_COMMON_CLK_CDCE706)      += clk-cdce706.o
  obj-$(CONFIG_ARCH_CLPS711X)           += clk-clps711x.o
  obj-$(CONFIG_ARCH_EFM32)              += clk-efm32gg.o