Skip to contentSkip to conversation

clk: ti: Drop use of clk-private.h

PATCH Applied Stephen Boyd 3 participants 3 messages Jan 22, 2015 – Jan 27, 2015

Subsystems (2)
Common clk TI clock driver
lore
Share & tools
lore

Stephen Boyd

author
#0 lore raw

PATCH 1/1 clk: ti: Drop use of clk-private.h

These modules don't need to include clk-private.h. Replace the include with clk.h because these modules are clock consumers and also include clk-provider.h in clk/ti.h because struct clk_hw_omap has a struct clk_hw embedded in it.

Cc Tero Kristo <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Paul Walmsley <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
---
 drivers/clk/ti/clk-44xx.c | 2 +-
 drivers/clk/ti/clk-54xx.c | 2 +-
 drivers/clk/ti/clk-7xx.c  | 2 +-
 include/linux/clk/ti.h    | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
drivers/clk/ti/clk-44xx.c +1 -1
index 02517a8206bd..4f4c87751db5 100644
@@ -12,7 +12,7 @@
 
 #include <linux/kernel.h>
 #include <linux/list.h>
-#include <linux/clk-private.h>
+#include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/clk/ti.h>
drivers/clk/ti/clk-54xx.c +1 -1
index 5e183993e3ec..14160b223548 100644
@@ -12,7 +12,7 @@
 
 #include <linux/kernel.h>
 #include <linux/list.h>
-#include <linux/clk-private.h>
+#include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/io.h>
 #include <linux/clk/ti.h>
drivers/clk/ti/clk-7xx.c +1 -1
index 62ac8f6e480c..ee32f4deebf4 100644
@@ -12,7 +12,7 @@
 
 #include <linux/kernel.h>
 #include <linux/list.h>
-#include <linux/clk-private.h>
+#include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/clk/ti.h>
include/linux/clk/ti.h +1 -0
index cfb9e554de6f..34042b56b0d0 100644
@@ -15,6 +15,7 @@
 #ifndef __LINUX_CLK_TI_H__
 #define __LINUX_CLK_TI_H__
 
+#include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 
 /**
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Stephen Boyd

These modules don't need to include clk-private.h. Replace the include with clk.h because these modules are clock consumers and also include clk-provider.h in clk/ti.h because struct clk_hw_omap has a struct clk_hw embedded in it.

Cc Tero Kristo <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Paul Walmsley <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
Reviewed-by Paul Walmsley <[email protected]>

- Paul

Applied
#2 lore raw

Quoting Paul Walmsley (2015-01-23 02:35:07)

Quoted 7 lines · Stephen Boyd
Quoted 6 lines

These modules don't need to include clk-private.h. Replace the include with clk.h because these modules are clock consumers and also include clk-provider.h in clk/ti.h because struct clk_hw_omap has a struct clk_hw embedded in it.

Quoted 6 lines
Quoted 4 lines
Cc Tero Kristo <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Paul Walmsley <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
Reviewed-by Paul Walmsley <[email protected]>

Applied to clk-next.

Regards,
Mike

Quoted 3 lines

- Paul