[PATCH 04/13] m68k: coldfire: enable common clock framework

[Greg Ungerer <gerg@linux-m68k.org>]

Enable the ColdFire clock driver code to use the common clock framework.
This is not an actual conversion of the code proper. It is a work around
to allow defining clock bindings in a devicetree for ColdFire targets.
It is enough to allow the use of "fixed" clocks, which for many ColdFire
targets is enough for a simple devicetree setup.

A full conversion to the common clock framework and use of the generic
clk struct is still needed to complete this work.

Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
---
 arch/m68k/Kconfig.cpu    | 2 +-
 arch/m68k/coldfire/clk.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index c9a7e602d8a4..50ecb16d0a1f 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -30,7 +30,7 @@ config COLDFIRE
 	select CPU_HAS_NO_MULDIV64
 	select GENERIC_CSUM
 	select GPIOLIB
-	select HAVE_LEGACY_CLK
+	select COMMON_CLK
 	select HAVE_PAGE_SIZE_8KB if !MMU
 
 config SUN3
diff --git a/arch/m68k/coldfire/clk.c b/arch/m68k/coldfire/clk.c
index d03b6c4aa86b..bb4c0a2a8a61 100644
--- a/arch/m68k/coldfire/clk.c
+++ b/arch/m68k/coldfire/clk.c
@@ -20,8 +20,6 @@
 #include <asm/mcfsim.h>
 #include <asm/mcfclk.h>
 
-static DEFINE_SPINLOCK(clk_lock);
-
 #ifdef MCFPM_PPMCR0
 /*
  *	For more advanced ColdFire parts that have clocks that can be enabled
@@ -73,6 +71,10 @@ struct clk_ops clk_ops1 = {
 #endif /* MCFPM_PPMCR1 */
 #endif /* MCFPM_PPMCR0 */
 
+#ifndef CONFIG_COMMON_CLK
+
+static DEFINE_SPINLOCK(clk_lock);
+
 int clk_enable(struct clk *clk)
 {
 	unsigned long flags;
@@ -141,4 +143,6 @@ struct clk *clk_get_parent(struct clk *clk)
 }
 EXPORT_SYMBOL(clk_get_parent);
 
+#endif /* !CONFIG_COMMON_CLK */
+
 /***************************************************************************/
-- 
2.43.0