Merge tag 'sunxi-clocks-for-4.4' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Mon, 26 Oct 2015 05:42:37 +0000 (14:42 +0900)
committerOlof Johansson <olof@lixom.net>
Mon, 26 Oct 2015 05:42:37 +0000 (14:42 +0900)
commitedd2a06d9c06a28f6f636929d586d17de835cd6b
tree97c8d63dd247494999bda213da1b845de853cf69
parent64ebda3acd6ea592e6f97dcd0682e87aa7cf8d61
parent9b038bc58ad2658c76fd8b50bb333dfd4454573c
Merge tag 'sunxi-clocks-for-4.4' of https://git./linux/kernel/git/mripard/linux into next/dt

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 <olof@lixom.net>
drivers/clk/Makefile