diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-10-18 14:32:58 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-18 14:32:58 +0200 |
| commit | de9186c257acb06ca8187cff1c94412b5f80a3bd (patch) | |
| tree | 5f863be8c11182f5390c375b70c5e1e95bddcafd /drivers/sh | |
| parent | sh: clkfwk: modify for_each_frequency end condition (diff) | |
| download | linux-de9186c257acb06ca8187cff1c94412b5f80a3bd.tar.xz linux-de9186c257acb06ca8187cff1c94412b5f80a3bd.zip | |
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>
Diffstat (limited to 'drivers/sh')
| -rw-r--r-- | drivers/sh/Makefile | 7 | ||||
| -rw-r--r-- | drivers/sh/clk/Makefile | 3 | ||||
| -rw-r--r-- | drivers/sh/clk/core.c (renamed from drivers/sh/clk.c) | 2 | ||||
| -rw-r--r-- | drivers/sh/clk/cpg.c (renamed from drivers/sh/clk-cpg.c) | 9 |
4 files changed, 16 insertions, 5 deletions
diff --git a/drivers/sh/Makefile b/drivers/sh/Makefile index 50dd5a65f72e..24e6cec0ae8d 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 000000000000..5d15ebfaa074 --- /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 index dae64ee9ecc5..fd0d1b98901c 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 index 392627be4544..3aea5f0ceb09 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> |