git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ep93xx
/
clock.c
diff --git
a/arch/arm/mach-ep93xx/clock.c
b/arch/arm/mach-ep93xx/clock.c
index f174d1a3b11c7333d18a19f3524e39256af05add..9d7515c36bffa84e08c5c065fc5abfb008b58652 100644
(file)
--- a/
arch/arm/mach-ep93xx/clock.c
+++ b/
arch/arm/mach-ep93xx/clock.c
@@
-27,6
+27,10
@@
struct clk {
u32 enable_mask;
};
+static struct clk clk_uart = {
+ .name = "UARTCLK",
+ .rate = 14745600,
+};
static struct clk clk_pll1 = {
.name = "pll1",
};
@@
-50,6
+54,7
@@
static struct clk clk_usb_host = {
static struct clk *clocks[] = {
+ &clk_uart,
&clk_pll1,
&clk_f,
&clk_h,