From: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
We now have a proper clocksource driver for davinci. Switch the platform
to using it.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
---
arch/arm/mach-davinci/dm365.c | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 842b7e706ba1..ff7754ce2bbe 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -34,7 +34,8 @@
#include <mach/irqs.h>
#include <mach/mux.h>
#include <mach/serial.h>
-#include <mach/time.h>
+
+#include <clocksource/timer-davinci.h>
#include "asp.h"
#include "davinci.h"
@@ -658,10 +659,24 @@ static struct davinci_id dm365_ids[] = {
},
};
-static struct davinci_timer_info dm365_timer_info = {
- .timers = davinci_timer_instance,
- .clockevent_id = T0_BOT,
- .clocksource_id = T0_TOP,
+static const struct davinci_timer_cfg dm365_timer_cfg = {
+ .reg = {
+ .start = DAVINCI_TIMER0_BASE,
+ .end = DAVINCI_TIMER0_BASE + SZ_4K,
+ .flags = IORESOURCE_MEM,
+ },
+ .irq = {
+ {
+ .start = IRQ_TINT0_TINT12,
+ .end = IRQ_TINT0_TINT12,
+ .flags = IORESOURCE_IRQ,
+ },
+ {
+ .start = IRQ_TINT0_TINT34,
+ .end = IRQ_TINT0_TINT34,
+ .flags = IORESOURCE_IRQ,
+ }
+ }
};
#define DM365_UART1_BASE (IO_PHYS + 0x106000)
@@ -725,7 +740,6 @@ static const struct davinci_soc_info davinci_soc_info_dm365 = {
.intc_type = DAVINCI_INTC_TYPE_AINTC,
.intc_irq_prios = dm365_default_priorities,
.intc_irq_num = DAVINCI_N_AINTC_IRQ,
- .timer_info = &dm365_timer_info,
.emac_pdata = &dm365_emac_pdata,
.sram_dma = 0x00010000,
.sram_len = SZ_32K,
@@ -773,6 +787,7 @@ void __init dm365_init_time(void)
{
void __iomem *pll1, *pll2, *psc;
struct clk *clk;
+ int rv;
clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DM365_REF_FREQ);
@@ -788,7 +803,8 @@ void __init dm365_init_time(void)
clk = clk_get(NULL, "timer0");
WARN(IS_ERR(clk), "Unable to get the timer clock\n");
- davinci_timer_init(clk);
+ rv = davinci_timer_register(clk, &dm365_timer_cfg);
+ WARN(rv, "Unable to register the timer: %d\n", rv);
}
void __init dm365_register_clocks(void)
--
2.19.1
