Merge branch 'cleanup-clk-h-includes' into clk-next

* cleanup-clk-h-includes: (62 commits)
  clk: Remove clk.h from clk-provider.h
  clk: h8300: Remove clk.h and clkdev.h includes
  clk: at91: Include clk.h and slab.h
  clk: ti: Switch clk-provider.h include to clk.h
  clk: pistachio: Include clk.h
  clk: ingenic: Include clk.h
  clk: si570: Include clk.h
  clk: moxart: Include clk.h
  clk: cdce925: Include clk.h
  clk: Include clk.h in clk.c
  clk: zynq: Include clk.h
  clk: ti: Include clk.h
  clk: sunxi: Include clk.h and remove unused clkdev.h includes
  clk: st: Include clk.h
  clk: qcom: Include clk.h
  clk: highbank: Include clk.h
  clk: bcm: Include clk.h
  clk: versatile: Remove clk.h and clkdev.h includes
  clk: ux500: Remove clk.h and clkdev.h includes
  clk: tegra: Properly include clk.h
  ...

diff --cc arch/arm/mach-omap2/clock.c
Simple merge

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

diff --cc drivers/clk/at91/clk-slow.c
Simple merge

diff --cc drivers/clk/bcm/clk-kona.c
Simple merge

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

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

diff --cc drivers/clk/h8300/clk-div.c
Simple merge

diff --cc drivers/clk/h8300/clk-h8s2678.c
Simple merge

diff --cc drivers/clk/hisilicon/clk-hi3620.c
Simple merge

diff --cc drivers/clk/keystone/pll.c
Simple merge

diff --cc drivers/clk/mediatek/clk-mt8173.c
Simple merge

diff --cc drivers/clk/mediatek/clk-mtk.h
Simple merge

diff --cc drivers/clk/qcom/mmcc-msm8960.c
Simple merge

diff --cc drivers/clk/rockchip/clk-mmc-phase.c
index f2c6889f289ce25b183054bad91d55dfb5b6f179,3244c6e391d789b7345e2c2b184c07a1b7f71db4..77e19097bdc7c9c1b29979ab220f7ccb47662881
--- 1/drivers/clk/rockchip/clk-mmc-phase.c
--- 2/drivers/clk/rockchip/clk-mmc-phase.c
+++ b/drivers/clk/rockchip/clk-mmc-phase.c
@@@ -14,9 -14,8 +14,10 @@@
   */
  
  #include <linux/slab.h>
+ #include <linux/clk.h>
  #include <linux/clk-provider.h>
 +#include <linux/io.h>
 +#include <linux/kernel.h>
  #include "clk.h"
  
  struct rockchip_mmc_clock {

diff --cc drivers/clk/rockchip/clk-rk3188.c
Simple merge

diff --cc drivers/clk/rockchip/clk.h
Simple merge

diff --cc drivers/clk/st/clk-flexgen.c
Simple merge

diff --cc drivers/clk/st/clkgen-fsyn.c
Simple merge

diff --cc drivers/clk/st/clkgen-mux.c
Simple merge

diff --cc drivers/clk/st/clkgen-pll.c
Simple merge

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

diff --cc drivers/clk/ti/apll.c
Simple merge

diff --cc drivers/clk/ti/clk-2xxx.c
index bd8790be2ab18c9f49c2ac263cc929e55cf20317,20cf5eed8c3d0c8ee27bdd6c1e3bd90e91fd008c..657c4fe07a955e615026d1724976789451d561ff
--- 1/drivers/clk/ti/clk-2xxx.c
--- 2/drivers/clk/ti/clk-2xxx.c
+++ b/drivers/clk/ti/clk-2xxx.c
@@@ -16,11 -16,9 +16,11 @@@
  
  #include <linux/kernel.h>
  #include <linux/list.h>
- #include <linux/clk-provider.h>
+ #include <linux/clk.h>
  #include <linux/clk/ti.h>
  
 +#include "clock.h"
 +
  static struct ti_dt_clk omap2xxx_clks[] = {
        DT_CLK(NULL, "func_32k_ck", "func_32k_ck"),
        DT_CLK(NULL, "secure_32k_ck", "secure_32k_ck"),

diff --cc drivers/clk/ti/clk-33xx.c
Simple merge

diff --cc drivers/clk/ti/clk-3xxx.c
Simple merge

diff --cc drivers/clk/ti/clk-43xx.c
Simple merge

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

diff --cc drivers/clk/ti/clockdomain.c
Simple merge

diff --cc drivers/clk/ti/dpll.c
Simple merge

diff --cc drivers/clk/ti/fapll.c
Simple merge

diff --cc include/linux/clk-provider.h
Simple merge