ARM: mach-shmobile: Use shared clock framework

PATCH New Magnus Damm 1 participant 1 message May 12, 2010

Subsystems (4)

Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture

lore

Share & tools

lore

Magnus Damm

author maintainer

2010-05-12 14:21 UTC #0 lore raw

PATCH 1/2 ARM: mach-shmobile: Use shared clock framework

From: Magnus Damm <[email protected]>

Teach SH-Mobile ARM how to make use of the shared SH clock framework. This commit is one atomic switch that dumps the local hackery and instead links in the shared clock framework code in drivers/sh. A few local functions are kept in clock.c.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/Kconfig               |    3 +
 arch/arm/mach-shmobile/Makefile              |    2 -
 arch/arm/mach-shmobile/clock-sh7367.c        |   36 ---------------------
 arch/arm/mach-shmobile/clock.c               |   44 ++++++++++++++++++++++++++
 arch/arm/mach-shmobile/include/mach/common.h |    2 +
 drivers/sh/Makefile                          |    2 -
 6 files changed, 52 insertions(+), 37 deletions(-)

arch/arm/mach-shmobile/Kconfig +3 -0

@@ -102,4 +102,7 @@ config SH_TIMER_TMU
 
 endmenu
 
+config SH_CLK_CPG
+	bool
+
 endif

arch/arm/mach-shmobile/Makefile +1 -1

@@ -3,7 +3,7 @@
 #
 
 # Common objects
-obj-y				:= timer.o console.o memory.o
+obj-y				:= timer.o console.o memory.o clock.o
 
 # CPU objects
 obj-$(CONFIG_ARCH_SH7367)	+= setup-sh7367.o clock-sh7367.o intc-sh7367.o

arch/arm/mach-shmobile/clock-sh7367.c +1 ~~-35~~

@@ -21,43 +21,9 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/clk.h>
-
-struct clk {
-	const char *name;
-	unsigned long rate;
-};
-
+#include <linux/sh_clk.h>
 #include <asm/clkdev.h>
 
-int __clk_get(struct clk *clk)
-{
-	return 1;
-}
-EXPORT_SYMBOL(__clk_get);
-
-void __clk_put(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(__clk_put);
-
-
-int clk_enable(struct clk *clk)
-{
-	return 0;
-}
-EXPORT_SYMBOL(clk_enable);
-
-void clk_disable(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_disable);
-
-unsigned long clk_get_rate(struct clk *clk)
-{
-	return clk ? clk->rate : 0;
-}
-EXPORT_SYMBOL(clk_get_rate);
-
 /* a static peripheral clock for now - enough to get sh-sci working */
 static struct clk peripheral_clk = {
 	.name	    = "peripheral_clk",

arch/arm/mach-shmobile/clock.c new file +44 -0

44 lines not on this page · raw message

arch/arm/mach-shmobile/include/mach/common.h +2 -0

@@ -4,6 +4,8 @@
 extern struct sys_timer shmobile_timer;
 extern void shmobile_setup_console(void);
 
+extern int clk_init(void);
+
 /* allocate contiguous memory chunk and fill in struct resource */
 extern int platform_resource_setup_memory(struct platform_device *pdev,
 					  char *name, unsigned long memsize);

drivers/sh/Makefile +1 -1

@@ -4,6 +4,6 @@
 obj-$(CONFIG_SUPERHYWAY)	+= superhyway/
 obj-$(CONFIG_MAPLE)		+= maple/
 obj-$(CONFIG_GENERIC_GPIO)	+= pfc.o
-obj-$(CONFIG_SUPERH)		+= clk.o
 obj-$(CONFIG_SH_CLK_CPG)	+= clk-cpg.o
+obj-y				+= clk.o
 obj-y				+= intc.o