summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu/sh4a
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-05-12 19:29:04 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-05-12 19:29:04 +0900
commit9fe5ee0efb1b1d4a0939bc4252a8427e3337d96a (patch)
tree5a1d8b6e7d92a8f83ba94ea22feccef2461f1f9b /arch/sh/kernel/cpu/sh4a
parentf3f8290cb3fa4aa627321530bb85d5f35e487433 (diff)
sh: clkfwk: Use arch_clk_init() for on-chip clock registration.
CPUs registering on-chip clocks should be using arch_clk_init() with the new scheme so that the CPUs have the opportunity to establish the topology prior to the initial root clock rate propagation. This ensures that CPUs with on-chip clocks that use CLK_ENABLE_ON_INIT are properly enabled at the initial propagation time, without having to further poke the root clocks. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a')
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7763.c3
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7780.c3
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7785.c3
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-sh7786.c3
-rw-r--r--arch/sh/kernel/cpu/sh4a/clock-shx3.c3
5 files changed, 5 insertions, 10 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7763.c b/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
index 0110da64a43..ce3d4e6319a 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7763.c
@@ -90,7 +90,7 @@ static struct clk *sh7763_onchip_clocks[] = {
&sh7763_shyway_clk,
};
-static int __init sh7763_clk_init(void)
+int __init arch_clk_init(void)
{
struct clk *clk = clk_get(NULL, "master_clk");
int i, ret = 0;
@@ -106,4 +106,3 @@ static int __init sh7763_clk_init(void)
return ret;
}
-arch_initcall(sh7763_clk_init);
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c
index 0a22d50b109..38b8b1ddb28 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c
@@ -96,7 +96,7 @@ static struct clk *sh7780_onchip_clocks[] = {
&sh7780_shyway_clk,
};
-static int __init sh7780_clk_init(void)
+int __init arch_clk_init(void)
{
struct clk *clk = clk_get(NULL, "master_clk");
int i, ret = 0;
@@ -112,4 +112,3 @@ static int __init sh7780_clk_init(void)
return ret;
}
-arch_initcall(sh7780_clk_init);
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
index 4dcd1f6f0cb..fa14f35bc11 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7785.c
@@ -134,7 +134,7 @@ static struct clk *sh7785_onchip_clocks[] = {
&sh7785_ram_clk,
};
-static int __init sh7785_clk_init(void)
+int __init arch_clk_init(void)
{
struct clk *clk = clk_get(NULL, "master_clk");
int i, ret = 0;
@@ -150,4 +150,3 @@ static int __init sh7785_clk_init(void)
return ret;
}
-arch_initcall(sh7785_clk_init);
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7786.c b/arch/sh/kernel/cpu/sh4a/clock-sh7786.c
index 825556fe230..7907002fa1d 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7786.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7786.c
@@ -120,7 +120,7 @@ static struct clk *sh7786_onchip_clocks[] = {
&sh7786_ddr_clk,
};
-static int __init sh7786_clk_init(void)
+int __init arch_clk_init(void)
{
struct clk *clk = clk_get(NULL, "master_clk");
int i, ret = 0;
@@ -136,4 +136,3 @@ static int __init sh7786_clk_init(void)
return ret;
}
-arch_initcall(sh7786_clk_init);
diff --git a/arch/sh/kernel/cpu/sh4a/clock-shx3.c b/arch/sh/kernel/cpu/sh4a/clock-shx3.c
index 1eb149b0fe6..c14553e3e13 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-shx3.c
@@ -107,7 +107,7 @@ static struct clk *shx3_onchip_clocks[] = {
&shx3_shyway_clk,
};
-static int __init shx3_clk_init(void)
+int __init arch_clk_init(void)
{
struct clk *clk = clk_get(NULL, "master_clk");
int i, ret = 0;
@@ -123,4 +123,3 @@ static int __init shx3_clk_init(void)
return ret;
}
-arch_initcall(shx3_clk_init);