Commit a248f524 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori

ARM: davinci: da830: switch to using the clocksource driver

We now have a proper clocksource driver for davinci. Switch the da830
platform to using it.
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 76c7473f
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
#include <mach/common.h> #include <mach/common.h>
#include <mach/cputype.h> #include <mach/cputype.h>
#include <mach/da8xx.h> #include <mach/da8xx.h>
#include <mach/time.h>
#include <clocksource/timer-davinci.h>
#include "irqs.h" #include "irqs.h"
#include "mux.h" #include "mux.h"
...@@ -676,32 +677,17 @@ int __init da830_register_gpio(void) ...@@ -676,32 +677,17 @@ int __init da830_register_gpio(void)
return da8xx_register_gpio(&da830_gpio_platform_data); return da8xx_register_gpio(&da830_gpio_platform_data);
} }
static struct davinci_timer_instance da830_timer_instance[2] = {
{
.base = DA8XX_TIMER64P0_BASE,
.bottom_irq = DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT12_0),
.top_irq = DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT34_0),
.cmp_off = DA830_CMP12_0,
.cmp_irq = DAVINCI_INTC_IRQ(IRQ_DA830_T12CMPINT0_0),
},
{
.base = DA8XX_TIMER64P1_BASE,
.bottom_irq = DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT12_1),
.top_irq = DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT34_1),
.cmp_off = DA830_CMP12_0,
.cmp_irq = DAVINCI_INTC_IRQ(IRQ_DA830_T12CMPINT0_1),
},
};
/* /*
* T0_BOT: Timer 0, bottom : Used for clock_event & clocksource * Bottom half of timer0 is used both for clock even and clocksource.
* T0_TOP: Timer 0, top : Used by DSP * Top half is used by DSP.
* T1_BOT, T1_TOP: Timer 1, bottom & top: Used for watchdog timer
*/ */
static struct davinci_timer_info da830_timer_info = { static const struct davinci_timer_cfg da830_timer_cfg = {
.timers = da830_timer_instance, .reg = DEFINE_RES_IO(DA8XX_TIMER64P0_BASE, SZ_4K),
.clockevent_id = T0_BOT, .irq = {
.clocksource_id = T0_BOT, DEFINE_RES_IRQ(DAVINCI_INTC_IRQ(IRQ_DA830_T12CMPINT0_0)),
DEFINE_RES_IRQ(DAVINCI_INTC_IRQ(IRQ_DA8XX_TINT12_0)),
},
.cmp_off = DA830_CMP12_0,
}; };
static const struct davinci_soc_info davinci_soc_info_da830 = { static const struct davinci_soc_info davinci_soc_info_da830 = {
...@@ -713,7 +699,6 @@ static const struct davinci_soc_info davinci_soc_info_da830 = { ...@@ -713,7 +699,6 @@ static const struct davinci_soc_info davinci_soc_info_da830 = {
.pinmux_base = DA8XX_SYSCFG0_BASE + 0x120, .pinmux_base = DA8XX_SYSCFG0_BASE + 0x120,
.pinmux_pins = da830_pins, .pinmux_pins = da830_pins,
.pinmux_pins_num = ARRAY_SIZE(da830_pins), .pinmux_pins_num = ARRAY_SIZE(da830_pins),
.timer_info = &da830_timer_info,
.emac_pdata = &da8xx_emac_pdata, .emac_pdata = &da8xx_emac_pdata,
}; };
...@@ -743,6 +728,7 @@ void __init da830_init_time(void) ...@@ -743,6 +728,7 @@ void __init da830_init_time(void)
{ {
void __iomem *pll; void __iomem *pll;
struct clk *clk; struct clk *clk;
int rv;
clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DA830_REF_FREQ); clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, DA830_REF_FREQ);
...@@ -756,7 +742,8 @@ void __init da830_init_time(void) ...@@ -756,7 +742,8 @@ void __init da830_init_time(void)
return; return;
} }
davinci_timer_init(clk); rv = davinci_timer_register(clk, &da830_timer_cfg);
WARN(rv, "Unable to register the timer: %d\n", rv);
} }
static struct resource da830_psc0_resources[] = { static struct resource da830_psc0_resources[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment