From: Stephen Boyd <sboyd@codeaurora.org>
Date: Tue, 21 Jul 2015 18:22:42 +0000 (-0700)
Subject: Merge branch 'cleanup-clk-h-includes' into clk-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9cfad9bc472a4bdd5ee7d9e713113a9f5a676704;p=openwrt%2Fstaging%2Fblogic.git

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
  ...
---

9cfad9bc472a4bdd5ee7d9e713113a9f5a676704
diff --cc drivers/clk/rockchip/clk-mmc-phase.c
index f2c6889f289c,3244c6e391d7..77e19097bdc7
--- a/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/ti/clk-2xxx.c
index bd8790be2ab1,20cf5eed8c3d..657c4fe07a95
--- a/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"),