summaryrefslogtreecommitdiff
path: root/arch/arm/mach-vexpress/v2m.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-12 13:31:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-23 18:04:53 +0100
commit7ff550de99141cbd3be0129d563cc4554fdde9f6 (patch)
tree21381e1dcdbd69b461cefc696a1a1fd80f38ce8e /arch/arm/mach-vexpress/v2m.c
parentfb593cf38fc426331275d761fefe13096070f56a (diff)
downloadlinux-3.10-7ff550de99141cbd3be0129d563cc4554fdde9f6.tar.gz
linux-3.10-7ff550de99141cbd3be0129d563cc4554fdde9f6.tar.bz2
linux-3.10-7ff550de99141cbd3be0129d563cc4554fdde9f6.zip
clocksource: ARM sp804: obtain sp804 timer rate via clks
This allows platforms to specify the rate of the SP804 clocksource via the clk subsystem. While ARM boards clock these at 1MHz, BCMRing also has SP804 timers but are clocked at different rates. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
-rw-r--r--arch/arm/mach-vexpress/v2m.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index ccf1f899ac2..77d5db3d780 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -333,6 +333,10 @@ static struct clk osc2_clk = {
.rate = 24000000,
};
+static struct clk v2m_sp804_clk = {
+ .rate = 1000000,
+};
+
static struct clk dummy_apb_pclk;
static struct clk_lookup v2m_lookups[] = {
@@ -363,6 +367,10 @@ static struct clk_lookup v2m_lookups[] = {
}, { /* CLCD */
.dev_id = "mb:clcd",
.clk = &osc1_clk,
+ }, { /* SP804 timers */
+ .dev_id = "sp804",
+ .con_id = "v2m-timer1",
+ .clk = &v2m_sp804_clk,
},
};