diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-30 12:46:52 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-30 12:46:52 -0500 |
commit | 112243034cec7c3ef0499fdebf39218714da453d (patch) | |
tree | f6469eaab26ea2e985da32b5cc297ddb9c64f952 /arch/arm/mach-aaec2000/core.c | |
parent | 773e9610a7bd44720b8b625d01997b2953edc2db (diff) | |
parent | ee569c43e340202fb0ba427c57b77568a32b9a3a (diff) |
Merge branch 'clks' into devel
Diffstat (limited to 'arch/arm/mach-aaec2000/core.c')
-rw-r--r-- | arch/arm/mach-aaec2000/core.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c index dfb26bc23d1a..50e13965dfed 100644 --- a/arch/arm/mach-aaec2000/core.c +++ b/arch/arm/mach-aaec2000/core.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
20 | #include <linux/timex.h> | 20 | #include <linux/timex.h> |
21 | #include <linux/signal.h> | 21 | #include <linux/signal.h> |
22 | #include <linux/clk.h> | ||
22 | 23 | ||
23 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
24 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
@@ -30,7 +31,6 @@ | |||
30 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
31 | 32 | ||
32 | #include "core.h" | 33 | #include "core.h" |
33 | #include "clock.h" | ||
34 | 34 | ||
35 | /* | 35 | /* |
36 | * Common I/O mapping: | 36 | * Common I/O mapping: |
@@ -229,9 +229,28 @@ static struct amba_device *amba_devs[] __initdata = { | |||
229 | &clcd_device, | 229 | &clcd_device, |
230 | }; | 230 | }; |
231 | 231 | ||
232 | static struct clk aaec2000_clcd_clk = { | 232 | void clk_disable(struct clk *clk) |
233 | .name = "CLCDCLK", | 233 | { |
234 | }; | 234 | } |
235 | |||
236 | int clk_set_rate(struct clk *clk, unsigned long rate) | ||
237 | { | ||
238 | return 0; | ||
239 | } | ||
240 | |||
241 | int clk_enable(struct clk *clk) | ||
242 | { | ||
243 | return 0; | ||
244 | } | ||
245 | |||
246 | struct clk *clk_get(struct device *dev, const char *id) | ||
247 | { | ||
248 | return dev && strcmp(dev_name(dev), "mb:16") == 0 ? NULL : ERR_PTR(-ENOENT); | ||
249 | } | ||
250 | |||
251 | void clk_put(struct clk *clk) | ||
252 | { | ||
253 | } | ||
235 | 254 | ||
236 | void __init aaec2000_set_clcd_plat_data(struct aaec2000_clcd_info *clcd) | 255 | void __init aaec2000_set_clcd_plat_data(struct aaec2000_clcd_info *clcd) |
237 | { | 256 | { |
@@ -265,8 +284,6 @@ static int __init aaec2000_init(void) | |||
265 | { | 284 | { |
266 | int i; | 285 | int i; |
267 | 286 | ||
268 | clk_register(&aaec2000_clcd_clk); | ||
269 | |||
270 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { | 287 | for (i = 0; i < ARRAY_SIZE(amba_devs); i++) { |
271 | struct amba_device *d = amba_devs[i]; | 288 | struct amba_device *d = amba_devs[i]; |
272 | amba_device_register(d, &iomem_resource); | 289 | amba_device_register(d, &iomem_resource); |