diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-01-26 22:13:09 -0500 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-01-29 12:14:22 -0500 |
commit | 4680c29f69e981106da2abfea7f1a3e6f1b03791 (patch) | |
tree | c3998052c1d27009c524274d5823636375bf383c /arch | |
parent | 35e424e2c0229aa1e32776fac23902150bd0ab9a (diff) |
OMAP2/3 clock: clean up omap*_clk_arch_init()
In the OMAP3xxx clock code, remove the #ifdef CONFIG_ARCH_OMAP3 in
clock34xx.c, since this file is only compiled for OMAP3xxx builds. Also,
rename omap2_clk_arch_init in this file to omap3xxx_clk_arch_init() to
pave the way for multi-OMAP kernels. Ensure that it is not executed
on non-OMAP3xxx systems.
In the OMAP2xxx clock code, rename omap2_clk_arch_init in this file to
omap2xxx_clk_arch_init() to pave the way for multi-OMAP kernels.
Ensure that it is not executed on non-OMAP2xxx systems.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/clock2xxx.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-omap2/clock34xx.c | 16 |
2 files changed, 10 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/clock2xxx.c b/arch/arm/mach-omap2/clock2xxx.c index e5b9851b7419..b7e81ec3d819 100644 --- a/arch/arm/mach-omap2/clock2xxx.c +++ b/arch/arm/mach-omap2/clock2xxx.c | |||
@@ -101,11 +101,14 @@ void omap2_clk_prepare_for_reboot(void) | |||
101 | * Switch the MPU rate if specified on cmdline. | 101 | * Switch the MPU rate if specified on cmdline. |
102 | * We cannot do this early until cmdline is parsed. | 102 | * We cannot do this early until cmdline is parsed. |
103 | */ | 103 | */ |
104 | static int __init omap2_clk_arch_init(void) | 104 | static int __init omap2xxx_clk_arch_init(void) |
105 | { | 105 | { |
106 | struct clk *virt_prcm_set, *sys_ck, *dpll_ck, *mpu_ck; | 106 | struct clk *virt_prcm_set, *sys_ck, *dpll_ck, *mpu_ck; |
107 | unsigned long sys_ck_rate; | 107 | unsigned long sys_ck_rate; |
108 | 108 | ||
109 | if (!cpu_is_omap24xx()) | ||
110 | return 0; | ||
111 | |||
109 | if (!mpurate) | 112 | if (!mpurate) |
110 | return -EINVAL; | 113 | return -EINVAL; |
111 | 114 | ||
@@ -129,6 +132,6 @@ static int __init omap2_clk_arch_init(void) | |||
129 | 132 | ||
130 | return 0; | 133 | return 0; |
131 | } | 134 | } |
132 | arch_initcall(omap2_clk_arch_init); | 135 | arch_initcall(omap2xxx_clk_arch_init); |
133 | 136 | ||
134 | 137 | ||
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index 552ad300bb0e..d38ad44fe0aa 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c | |||
@@ -163,12 +163,6 @@ int omap3_dpll4_set_rate(struct clk *clk, unsigned long rate) | |||
163 | /* Common clock code */ | 163 | /* Common clock code */ |
164 | 164 | ||
165 | /* | 165 | /* |
166 | * As it is structured now, this will prevent an OMAP2/3 multiboot | ||
167 | * kernel from compiling. This will need further attention. | ||
168 | */ | ||
169 | #if defined(CONFIG_ARCH_OMAP3) | ||
170 | |||
171 | /* | ||
172 | * Set clocks for bypass mode for reboot to work. | 166 | * Set clocks for bypass mode for reboot to work. |
173 | */ | 167 | */ |
174 | void omap2_clk_prepare_for_reboot(void) | 168 | void omap2_clk_prepare_for_reboot(void) |
@@ -213,11 +207,14 @@ void omap3_clk_lock_dpll5(void) | |||
213 | * Switch the MPU rate if specified on cmdline. | 207 | * Switch the MPU rate if specified on cmdline. |
214 | * We cannot do this early until cmdline is parsed. | 208 | * We cannot do this early until cmdline is parsed. |
215 | */ | 209 | */ |
216 | static int __init omap2_clk_arch_init(void) | 210 | static int __init omap3xxx_clk_arch_init(void) |
217 | { | 211 | { |
218 | struct clk *osc_sys_ck, *dpll1_ck, *arm_fck, *core_ck; | 212 | struct clk *osc_sys_ck, *dpll1_ck, *arm_fck, *core_ck; |
219 | unsigned long osc_sys_rate; | 213 | unsigned long osc_sys_rate; |
220 | 214 | ||
215 | if (!cpu_is_omap34xx()) | ||
216 | return 0; | ||
217 | |||
221 | if (!mpurate) | 218 | if (!mpurate) |
222 | return -EINVAL; | 219 | return -EINVAL; |
223 | 220 | ||
@@ -246,9 +243,6 @@ static int __init omap2_clk_arch_init(void) | |||
246 | 243 | ||
247 | return 0; | 244 | return 0; |
248 | } | 245 | } |
249 | arch_initcall(omap2_clk_arch_init); | 246 | arch_initcall(omap3xxx_clk_arch_init); |
250 | |||
251 | |||
252 | #endif | ||
253 | 247 | ||
254 | 248 | ||