git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
s3c2410-clock.c
diff --git
a/arch/arm/mach-s3c2410/s3c2410-clock.c
b/arch/arm/mach-s3c2410/s3c2410-clock.c
index
fd17c60
..
992cc6a
100644
(file)
--- a/
arch/arm/mach-s3c2410/s3c2410-clock.c
+++ b/
arch/arm/mach-s3c2410/s3c2410-clock.c
@@
-1,4
+1,4
@@
-/* linux/arch/arm/mach-s3c2410/clock.c
+/* linux/arch/arm/mach-s3c2410/
s3c2410-
clock.c
*
* Copyright (c) 2006 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
*
* Copyright (c) 2006 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
@@
-30,13
+30,18
@@
#include <linux/clk.h>
#include <linux/mutex.h>
#include <linux/delay.h>
#include <linux/clk.h>
#include <linux/mutex.h>
#include <linux/delay.h>
+#include <linux/serial_core.h>
+
+#include <asm/mach/map.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/io.h>
+#include <asm/arch/regs-serial.h>
#include <asm/arch/regs-clock.h>
#include <asm/arch/regs-gpio.h>
#include <asm/arch/regs-clock.h>
#include <asm/arch/regs-gpio.h>
+#include "s3c2410.h"
#include "clock.h"
#include "cpu.h"
#include "clock.h"
#include "cpu.h"
@@
-182,7
+187,15
@@
static struct clk init_clocks[] = {
.id = -1,
.parent = &clk_p,
.ctrlbit = 0,
.id = -1,
.parent = &clk_p,
.ctrlbit = 0,
- }
+ }, {
+ .name = "usb-bus-host",
+ .id = -1,
+ .parent = &clk_usb_bus,
+ }, {
+ .name = "usb-bus-gadget",
+ .id = -1,
+ .parent = &clk_usb_bus,
+ },
};
/* s3c2410_baseclk_add()
};
/* s3c2410_baseclk_add()