summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu/clock.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-05-13 09:59:40 +0200
committerPaul Mundt <lethal@linux-sh.org>2009-05-13 09:59:40 +0200
commitaf777ce42d3d51cdef353ce296d6f99dc503feef (patch)
treed0f1f8d9b485da129b0298fd0d74ab8c829884e0 /arch/sh/kernel/cpu/clock.c
parentMerge branch 'master' into sh/clkfwk (diff)
downloadlinux-af777ce42d3d51cdef353ce296d6f99dc503feef.tar.xz
linux-af777ce42d3d51cdef353ce296d6f99dc503feef.zip
sh: clkfwk: module_clk -> peripheral_clk rename.
For consistenct naming, and to allow us to fix up some confusion in the SH-Mobile clock framework, amongst other places. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/clock.c')
-rw-r--r--arch/sh/kernel/cpu/clock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c
index 61ff227561dc..0eedf9392647 100644
--- a/arch/sh/kernel/cpu/clock.c
+++ b/arch/sh/kernel/cpu/clock.c
@@ -50,8 +50,8 @@ static struct clk master_clk = {
.rate = CONFIG_SH_PCLK_FREQ,
};
-static struct clk module_clk = {
- .name = "module_clk",
+static struct clk peripheral_clk = {
+ .name = "peripheral_clk",
.parent = &master_clk,
.flags = CLK_ENABLE_ON_INIT,
};
@@ -73,7 +73,7 @@ static struct clk cpu_clk = {
*/
static struct clk *onchip_clocks[] = {
&master_clk,
- &module_clk,
+ &peripheral_clk,
&bus_clk,
&cpu_clk,
};