summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress/v2m.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-09-22 16:38:39 -0700
committerTony Lindgren <tony@atomide.com>2011-09-22 16:38:39 -0700
commit7a04c4cbf73953f1995a141534b7fe0c35828057 (patch)
tree8b83a813600605510bd54cadb81f296d342e1b6b /arch/arm/mach-vexpress/v2m.c
parentf8cf8e47fb87e3b27e63d36fc8d61b11273f37bc (diff)
parentfbe01f51a8260c1f0a66e8730c4fd2c5160ecb91 (diff)
downloadblackbird-op-linux-7a04c4cbf73953f1995a141534b7fe0c35828057.tar.gz
blackbird-op-linux-7a04c4cbf73953f1995a141534b7fe0c35828057.zip
Merge branch 'for_3.2/omap_device' of git://gitorious.org/khilman/linux-omap-pm into cleanup
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
-rw-r--r--arch/arm/mach-vexpress/v2m.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 9e6b93b1a043..d0d267a8d3f9 100644
--- 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,
};
+static struct clk v2m_ref_clk = {
+ .rate = 32768,
+};
+
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,
+ }, { /* SP805 WDT */
+ .dev_id = "mb:wdt",
+ .clk = &v2m_ref_clk,
}, { /* SP804 timers */
.dev_id = "sp804",
.con_id = "v2m-timer0",
OpenPOWER on IntegriCloud