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 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-vexpress
/
v2m.c
diff --git
a/arch/arm/mach-vexpress/v2m.c
b/arch/arm/mach-vexpress/v2m.c
index
9e6b93b
..
d0d267a
100644
(file)
--- a/
arch/arm/mach-vexpress/v2m.c
+++ b/
arch/arm/mach-vexpress/v2m.c
@@
-318,6
+318,10
@@
static struct clk v2m_sp804_clk = {
.rate = 1000000,
};
.rate = 1000000,
};
+static struct clk v2m_ref_clk = {
+ .rate = 32768,
+};
+
static struct clk dummy_apb_pclk;
static struct clk_lookup v2m_lookups[] = {
static struct clk dummy_apb_pclk;
static struct clk_lookup v2m_lookups[] = {
@@
-348,6
+352,9
@@
static struct clk_lookup v2m_lookups[] = {
}, { /* CLCD */
.dev_id = "mb:clcd",
.clk = &osc1_clk,
}, { /* CLCD */
.dev_id = "mb:clcd",
.clk = &osc1_clk,
+ }, { /* SP805 WDT */
+ .dev_id = "mb:wdt",
+ .clk = &v2m_ref_clk,
}, { /* SP804 timers */
.dev_id = "sp804",
.con_id = "v2m-timer0",
}, { /* SP804 timers */
.dev_id = "sp804",
.con_id = "v2m-timer0",