Merge tag 'clk-for-linus-3.19' of git://git.linaro.org/people/mike.turquette/linux

Pull clk framework updates from Mike Turquette:
 "This is much later than usual due to several last minute bugs that had
  to be addressed.  As usual the majority of changes are new drivers and
  modifications to existing drivers.  The core recieved many fixes along
  with the groundwork for several large changes coming in the future
  which will better parition clock providers from clock consumers"

* tag 'clk-for-linus-3.19' of git://git.linaro.org/people/mike.turquette/linux: (86 commits)
  clk: samsung: Fix Exynos 5420 pinctrl setup and clock disable failure due to domain being gated
  ARM: OMAP3: clock: fix boot breakage in legacy mode
  ARM: OMAP2+: clock: fix DPLL code to use new determine rate APIs
  clk: Really fix deadlock with mmap_sem
  clk: mmp: fix sparse non static symbol warning
  clk: Change clk_ops->determine_rate to return a clk_hw as the best parent
  clk: change clk_debugfs_add_file to take a struct clk_hw
  clk: Don't expose __clk_get_accuracy
  clk: Don't try to use a struct clk* after it could have been freed
  clk: Remove unused function __clk_get_prepare_count
  clk: samsung: Fix double add of syscore ops after driver rebind
  clk: samsung: exynos4: set parent of sclk_hdmiphy to hdmi
  clk: samsung: exynos4415: Fix build with PM_SLEEP disabled
  clk: samsung: remove unnecessary inclusion of header files from clk.h
  clk: samsung: remove unnecessary CONFIG_OF from clk.c
  clk: samsung: Spelling s/bwtween/between/
  clk: rockchip: Add support for the mmc clock phases using the framework
  clk: rockchip: add bindings for the mmc clocks
  clk: rockchip: rk3288 export i2s0_clkout for use in DT
  clk: rockchip: use clock ID for DMC (memory controller) on rk3288
  ...

diff --cc MAINTAINERS
index 08f671dad3e935850a8eb636b0c2afb195ce1461,924499202dac89afab39ebd93005daa53fcb6ab5..ddb9ac8d32b3eddc46d66bd408392ae09b637ea7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2567,17 -2489,11 +2567,18 @@@ F:   fs/coda
  F:    include/linux/coda*.h
  F:    include/uapi/linux/coda*.h
  
 +CODA V4L2 MEM2MEM DRIVER
 +M:    Philipp Zabel <p.zabel@pengutronix.de>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/coda.txt
 +F:    drivers/media/platform/coda/
 +
  COMMON CLK FRAMEWORK
  M:    Mike Turquette <mturquette@linaro.org>
+ M:    Stephen Boyd <sboyd@codeaurora.org>
  L:    linux-kernel@vger.kernel.org
- T:    git git://git.linaro.org/people/mturquette/linux.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
  S:    Maintained
  F:    drivers/clk/
  X:    drivers/clk/clkdev.c

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/sun4i-a10.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sun5i-a10s.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sun6i-a31.dtsi
index a400172a8a52255c6ed7bd4226e3f9ee016d2dfc,4083201e93c8cc3a99f912be7cbcbf630869f7c6..f47156b6572bbaf09872686b70f09268200c3cc9
--- 1/arch/arm/boot/dts/sun6i-a31.dtsi
--- 2/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@@ -229,19 -217,11 +229,11 @@@
                                        "apb1_daudio1";
                };
  
-               apb2_mux: apb2_mux@01c20058 {
+               apb2: clk@01c20058 {
                        #clock-cells = <0>;
-                       compatible = "allwinner,sun4i-a10-apb1-mux-clk";
+                       compatible = "allwinner,sun4i-a10-apb1-clk";
                        reg = <0x01c20058 0x4>;
 -                      clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
 +                      clocks = <&osc32k>, <&osc24M>, <&pll6 0>, <&pll6 0>;
-                       clock-output-names = "apb2_mux";
-               };
- 
-               apb2: apb2@01c20058 {
-                       #clock-cells = <0>;
-                       compatible = "allwinner,sun6i-a31-apb2-div-clk";
-                       reg = <0x01c20058 0x4>;
-                       clocks = <&apb2_mux>;
                        clock-output-names = "apb2";
                };
  

diff --cc arch/arm/boot/dts/sun7i-a20.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sun8i-a23.dtsi
Simple merge

diff --cc arch/mips/alchemy/common/clock.c
Simple merge

diff --cc drivers/clk/clk-s2mps11.c
Simple merge

diff --cc drivers/clk/samsung/clk-exynos-audss.c
Simple merge