From de9186c257acb06ca8187cff1c94412b5f80a3bd Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 18 Oct 2010 21:32:58 +0900
Subject: [PATCH] sh: clkfwk: Shuffle around to match the intc split up.

This shuffles the clock framework code around to a drivers/sh/clk subdir,
to follow the intc split up. This will make it easier to subsequently
break things out as well as plug in different helpers for non-CPG users.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
 drivers/sh/Makefile                 | 7 +++----
 drivers/sh/clk/Makefile             | 3 +++
 drivers/sh/{clk.c => clk/core.c}    | 2 +-
 drivers/sh/{clk-cpg.c => clk/cpg.c} | 9 +++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 drivers/sh/clk/Makefile
 rename drivers/sh/{clk.c => clk/core.c} (99%)
 rename drivers/sh/{clk-cpg.c => clk/cpg.c} (96%)

diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile
index 50dd5a6..24e6cec 100644
--- a/drivers/sh/Makefile
+++ b/drivers/sh/Makefile
@@ -1,10 +1,9 @@
 #
 # Makefile for the SuperH specific drivers.
 #
-obj-y	:= clk.o intc/
+obj-y	:= intc/
 
-obj-$(CONFIG_SUPERHYWAY)	+= superhyway/
+obj-$(CONFIG_HAVE_CLK)		+= clk/
 obj-$(CONFIG_MAPLE)		+= maple/
-
+obj-$(CONFIG_SUPERHYWAY)	+= superhyway/
 obj-$(CONFIG_GENERIC_GPIO)	+= pfc.o
-obj-$(CONFIG_SH_CLK_CPG)	+= clk-cpg.o
diff --git a/drivers/sh/clk/Makefile b/drivers/sh/clk/Makefile
new file mode 100644
index 0000000..5d15ebf
--- /dev/null
+++ b/drivers/sh/clk/Makefile
@@ -0,0 +1,3 @@
+obj-y	:= core.o
+
+obj-$(CONFIG_SH_CLK_CPG)	+= cpg.o
diff --git a/drivers/sh/clk.c b/drivers/sh/clk/core.c
similarity index 99%
rename from drivers/sh/clk.c
rename to drivers/sh/clk/core.c
index dae64ee..fd0d1b9 100644
--- a/drivers/sh/clk.c
+++ b/drivers/sh/clk/core.c
@@ -1,5 +1,5 @@
 /*
- * drivers/sh/clk.c - SuperH clock framework
+ * SuperH clock framework
  *
  *  Copyright (C) 2005 - 2010  Paul Mundt
  *
diff --git a/drivers/sh/clk-cpg.c b/drivers/sh/clk/cpg.c
similarity index 96%
rename from drivers/sh/clk-cpg.c
rename to drivers/sh/clk/cpg.c
index 392627b..3aea5f0 100644
--- a/drivers/sh/clk-cpg.c
+++ b/drivers/sh/clk/cpg.c
@@ -1,3 +1,12 @@
+/*
+ * Helper routines for SuperH Clock Pulse Generator blocks (CPG).
+ *
+ *  Copyright (C) 2010  Magnus Damm
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
 #include <linux/clk.h>
 #include <linux/compiler.h>
 #include <linux/slab.h>
-- 
2.7.4