[PATCH 0/7] Remove clk.h from clk-provider.h (ARM part)

[PATCH 0/7] Remove clk.h from clk-provider.h (ARM part)

[Stephen Boyd]

This is the first set in a series of patches that removes
clk.h from clk-provider.h. This allows us to clearly see what
provider drivers are using the consumer API (clk.h) by
checking the includes. Currently clk.h is included by
clk-provider.h even though it doesn't need to so quite a few
clk provider drivers are relying on the implicit include.

Stephen Boyd (7):
  ARM: at91: Remove clk-provider.h include
  ARM: hisi: Remove clk-provider.h include
  ARM: keystone: Remove clk-provider.h include
  ARM: mvebu: Remove clk-provider.h include
  ARM: orion5x: Remove clk-provider.h include
  ARM: s3c64xx: Remove clk-provider.h include
  ARM: OMAP2+: Include clk.h

 arch/arm/mach-at91/at91rm9200.c    | 1 -
 arch/arm/mach-hisi/hisilicon.c     | 1 -
 arch/arm/mach-keystone/pm_domain.c | 1 -
 arch/arm/mach-mvebu/board-v7.c     | 1 -
 arch/arm/mach-omap2/clock.c        | 1 +
 arch/arm/mach-omap2/omap_hwmod.c   | 1 +
 arch/arm/mach-omap2/pm24xx.c       | 1 +
 arch/arm/mach-orion5x/board-dt.c   | 1 -
 arch/arm/mach-s3c64xx/common.c     | 1 -
 9 files changed, 3 insertions(+), 6 deletions(-)

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 1/7] ARM: at91: Remove clk-provider.h include

[Stephen Boyd]

This file doesn't use the clk provider APIs. Remove the include.

Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack if you want this to go through clk-tree.

 arch/arm/mach-at91/at91rm9200.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index eaf58f88ef5d..685826c4a710 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -8,7 +8,6 @@
  * Licensed under GPLv2 or later.
  */
 
-#include <linux/clk-provider.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 2/7] ARM: hisi: Remove clk-provider.h include

[Stephen Boyd]

This file doesn't use the clk provider APIs. Remove the include.

Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Wei Xu <xuwei5@hisilicon.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack if you want this to go through clk-tree.

 arch/arm/mach-hisi/hisilicon.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c
index c6bd7c7bd4aa..8cc62150116a 100644
--- a/arch/arm/mach-hisi/hisilicon.c
+++ b/arch/arm/mach-hisi/hisilicon.c
@@ -11,7 +11,6 @@
  * published by the Free Software Foundation.
 */
 
-#include <linux/clk-provider.h>
 #include <linux/clocksource.h>
 #include <linux/irqchip.h>
 
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 3/7] ARM: keystone: Remove clk-provider.h include

[Stephen Boyd]

This file doesn't use the clk provider APIs. Remove the include.

Cc: Nishanth Menon <nm@ti.com>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack if you want this to go through clk-tree.

 arch/arm/mach-keystone/pm_domain.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-keystone/pm_domain.c b/arch/arm/mach-keystone/pm_domain.c
index edea697e8253..e283939a216f 100644
--- a/arch/arm/mach-keystone/pm_domain.c
+++ b/arch/arm/mach-keystone/pm_domain.c
@@ -16,7 +16,6 @@
 #include <linux/pm_runtime.h>
 #include <linux/pm_clock.h>
 #include <linux/platform_device.h>
-#include <linux/clk-provider.h>
 #include <linux/of.h>
 
 static struct dev_pm_domain keystone_pm_domain = {
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 4/7] ARM: mvebu: Remove clk-provider.h include

[Stephen Boyd]

This file doesn't use the clk provider APIs. Remove the include.

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack if you want this to go through clk-tree.

 arch/arm/mach-mvebu/board-v7.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-mvebu/board-v7.c b/arch/arm/mach-mvebu/board-v7.c
index afee9083ad92..9f739f3cad4c 100644
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@ -14,7 +14,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/clk-provider.h>
 #include <linux/of_address.h>
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 5/7] ARM: orion5x: Remove clk-provider.h include

[Stephen Boyd]

This file doesn't use the clk provider APIs. Remove the include.

Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack if you want this to go through clk-tree.

 arch/arm/mach-orion5x/board-dt.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-orion5x/board-dt.c b/arch/arm/mach-orion5x/board-dt.c
index 79f033b1ddff..d0871786dd8a 100644
--- a/arch/arm/mach-orion5x/board-dt.c
+++ b/arch/arm/mach-orion5x/board-dt.c
@@ -16,7 +16,6 @@
 #include <linux/of_platform.h>
 #include <linux/cpu.h>
 #include <linux/mbus.h>
-#include <linux/clk-provider.h>
 #include <linux/clocksource.h>
 #include <asm/system_misc.h>
 #include <asm/mach/arch.h>
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 6/7] ARM: s3c64xx: Remove clk-provider.h include

[Stephen Boyd]

This file doesn't use the clk provider APIs. Remove the include.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 arch/arm/mach-s3c64xx/common.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c
index 16547f2641a3..25d6676f8d6e 100644
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@ -21,7 +21,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/clk-provider.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/serial_core.h>
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 7/7] ARM: OMAP2+: Include clk.h

[Stephen Boyd]

These files use the consumer API, so include clk.h explicitly.

Cc: Tero Kristo <t-kristo@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

Please ack so this can be routed through clk-tree. Otherwise
when clk.h is removed from clk-provider.h these files will
fail to compile.

 arch/arm/mach-omap2/clock.c      | 1 +
 arch/arm/mach-omap2/omap_hwmod.c | 1 +
 arch/arm/mach-omap2/pm24xx.c     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index a699d7169307..f664dc664ded 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/delay.h>
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/io.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index d78c12e7cb5e..de43e4c9a865 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -130,6 +130,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index b1aad7e1426c..2a1a4180d5d0 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -25,6 +25,7 @@
 #include <linux/sysfs.h>
 #include <linux/module.h>
 #include <linux/delay.h>
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/irq.h>
 #include <linux/time.h>
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[PATCH 3/7] ARM: keystone: Remove clk-provider.h include

[santosh.shilimkar at oracle.com]

On 7/10/15 3:45 PM, Stephen Boyd wrote:
> This file doesn't use the clk provider APIs. Remove the include.
>
> Cc: Nishanth Menon <nm@ti.com>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Santosh Shilimkar <ssantosh@kernel.org>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
>
> Please ack if you want this to go through clk-tree.
>
Sure.
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>

>   arch/arm/mach-keystone/pm_domain.c | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mach-keystone/pm_domain.c b/arch/arm/mach-keystone/pm_domain.c
> index edea697e8253..e283939a216f 100644
> --- a/arch/arm/mach-keystone/pm_domain.c
> +++ b/arch/arm/mach-keystone/pm_domain.c
> @@ -16,7 +16,6 @@
>   #include <linux/pm_runtime.h>
>   #include <linux/pm_clock.h>
>   #include <linux/platform_device.h>
> -#include <linux/clk-provider.h>
>   #include <linux/of.h>
>
>   static struct dev_pm_domain keystone_pm_domain = {
>

[PATCH 7/7] ARM: OMAP2+: Include clk.h

[Tero Kristo]

On 07/11/2015 01:45 AM, Stephen Boyd wrote:
> These files use the consumer API, so include clk.h explicitly.
>
> Cc: Tero Kristo <t-kristo@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
> ---
>
> Please ack so this can be routed through clk-tree. Otherwise
> when clk.h is removed from clk-provider.h these files will
> fail to compile.

Acked-by: Tero Kristo <t-kristo@ti.com>

>
>   arch/arm/mach-omap2/clock.c      | 1 +
>   arch/arm/mach-omap2/omap_hwmod.c | 1 +
>   arch/arm/mach-omap2/pm24xx.c     | 1 +
>   3 files changed, 3 insertions(+)
>
> diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
> index a699d7169307..f664dc664ded 100644
> --- a/arch/arm/mach-omap2/clock.c
> +++ b/arch/arm/mach-omap2/clock.c
> @@ -20,6 +20,7 @@
>   #include <linux/errno.h>
>   #include <linux/err.h>
>   #include <linux/delay.h>
> +#include <linux/clk.h>
>   #include <linux/clk-provider.h>
>   #include <linux/io.h>
>   #include <linux/bitops.h>
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index d78c12e7cb5e..de43e4c9a865 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -130,6 +130,7 @@
>   #include <linux/kernel.h>
>   #include <linux/errno.h>
>   #include <linux/io.h>
> +#include <linux/clk.h>
>   #include <linux/clk-provider.h>
>   #include <linux/delay.h>
>   #include <linux/err.h>
> diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
> index b1aad7e1426c..2a1a4180d5d0 100644
> --- a/arch/arm/mach-omap2/pm24xx.c
> +++ b/arch/arm/mach-omap2/pm24xx.c
> @@ -25,6 +25,7 @@
>   #include <linux/sysfs.h>
>   #include <linux/module.h>
>   #include <linux/delay.h>
> +#include <linux/clk.h>
>   #include <linux/clk-provider.h>
>   #include <linux/irq.h>
>   #include <linux/time.h>
>

[PATCH 1/7] ARM: at91: Remove clk-provider.h include

[Alexandre Belloni]

On 10/07/2015 at 15:45:41 -0700, Stephen Boyd wrote :
> This file doesn't use the clk provider APIs. Remove the include.
> 
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

> ---
> 
> Please ack if you want this to go through clk-tree.
> 
>  arch/arm/mach-at91/at91rm9200.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
> index eaf58f88ef5d..685826c4a710 100644
> --- a/arch/arm/mach-at91/at91rm9200.c
> +++ b/arch/arm/mach-at91/at91rm9200.c
> @@ -8,7 +8,6 @@
>   * Licensed under GPLv2 or later.
>   */
>  
> -#include <linux/clk-provider.h>
>  #include <linux/of.h>
>  #include <linux/of_platform.h>
>  
> -- 
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com