Merge branch 'clk-bcm2835' into clk-next

* clk-bcm2835:
  clk: bcm2835: Add support for programming the audio domain clocks
  clk: bcm2835: Add binding docs for the new platform clock driver.
  clk: bcm2835: Move under bcm/ with other Broadcom SoC clk drivers.

diff --combined drivers/clk/Makefile
index 6594e53a44446c3b4f91cc16aa467625edbc4082,9f71558553915f29c3c58c0cb38bb21576bdaabb..e44feca7a1ac3533316a2b3a2c41b0d7c57406b7
--- 1/drivers/clk/Makefile
--- 2/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -19,7 -19,6 +19,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
@@@ -37,7 -36,6 +36,7 @@@ obj-$(CONFIG_CLK_QORIQ)                       += clk-qoriq.
  obj-$(CONFIG_COMMON_CLK_RK808)                += clk-rk808.o
  obj-$(CONFIG_COMMON_CLK_S2MPS11)      += clk-s2mps11.o
  obj-$(CONFIG_COMMON_CLK_SI5351)               += clk-si5351.o
 +obj-$(CONFIG_COMMON_CLK_SI514)                += clk-si514.o
  obj-$(CONFIG_COMMON_CLK_SI570)                += clk-si570.o
  obj-$(CONFIG_COMMON_CLK_CDCE925)      += clk-cdce925.o
  obj-$(CONFIG_ARCH_STM32)              += clk-stm32f4.o