diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-12 15:45:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 18:04:53 +0100 |
| commit | 23828a7a976eb8dbe3b5f4e83584c3fe814b295b (patch) | |
| tree | 451a5429fd9fc76cb9714895736db464051ef9c2 /arch/arm/mach-vexpress | |
| parent | 57cc4f7de2b896ca79185e337eaf7ff9906c4656 (diff) | |
clockevents: ARM sp804: obtain sp804 timer rate via clks
This allows platforms to specify the rate of the SP804 clockevent 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')
| -rw-r--r-- | arch/arm/mach-vexpress/ct-ca9x4.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index 271213384203..2023a9e5211c 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c @@ -152,6 +152,10 @@ static struct clk_lookup lookups[] = { .clk = &osc1_clk, }, { /* SP804 timers */ .dev_id = "sp804", + .con_id = "ct-timer0", + .clk = &ct_sp804_clk, + }, { /* SP804 timers */ + .dev_id = "sp804", .con_id = "ct-timer1", .clk = &ct_sp804_clk, }, diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index f6fecdd0fbe8..9d9d4af384e2 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -370,6 +370,10 @@ static struct clk_lookup v2m_lookups[] = { .clk = &osc1_clk, }, { /* SP804 timers */ .dev_id = "sp804", + .con_id = "v2m-timer0", + .clk = &v2m_sp804_clk, + }, { /* SP804 timers */ + .dev_id = "sp804", .con_id = "v2m-timer1", .clk = &v2m_sp804_clk, }, |