summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/clock.c
diff options
context:
space:
mode:
authorBen Dooks <ben@trinity.fluff.org>2006-03-20 21:00:48 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-03-21 22:06:20 +0000
commit36c64af4e013ddf44c44298f50ff138ef1e2e7b7 (patch)
tree9ece82d6a2ed67fb3efa1e422435864f09c22d96 /arch/arm/mach-s3c2410/clock.c
parente44c03960f232e0f9bd2f6bcffccf83770757a8e (diff)
downloadblackbird-op-linux-36c64af4e013ddf44c44298f50ff138ef1e2e7b7.tar.gz
blackbird-op-linux-36c64af4e013ddf44c44298f50ff138ef1e2e7b7.zip
[ARM] 3361/1: S3C24XX - add USB bus clock source
Patch from Ben Dooks Add USB bus clock definition for 48MHz fed to OHCI and gadget cores Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410/clock.c')
-rw-r--r--arch/arm/mach-s3c2410/clock.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c
index 95c6d46c3dd6..fec02c92f95f 100644
--- a/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
@@ -53,7 +53,8 @@
/* clock information */
static LIST_HEAD(clocks);
-static DEFINE_MUTEX(clocks_mutex);
+
+DEFINE_MUTEX(clocks_mutex);
/* old functions */
@@ -296,6 +297,13 @@ static struct clk clk_p = {
.ctrlbit = 0,
};
+struct clk clk_usb_bus = {
+ .name = "usb-bus",
+ .id = -1,
+ .rate = 0,
+ .parent = &clk_upll,
+};
+
/* clocks that could be registered by external code */
static int s3c24xx_dclk_enable(struct clk *clk, int enable)
@@ -606,6 +614,10 @@ int __init s3c24xx_setup_clocks(unsigned long xtal,
if (s3c24xx_register_clock(&clk_p) < 0)
printk(KERN_ERR "failed to register cpu pclk\n");
+
+ if (s3c24xx_register_clock(&clk_usb_bus) < 0)
+ printk(KERN_ERR "failed to register usb bus clock\n");
+
/* register clocks from clock array */
for (ptr = 0; ptr < ARRAY_SIZE(init_clocks); ptr++, clkp++) {
OpenPOWER on IntegriCloud