Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7d91d26 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

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



We now have a proper clocksource driver for davinci. Switch the dm646x
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 135ce780

arch/arm/mach-davinci/dm646x.c

+13 −11
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ 
#include <mach/cputype.h>

#include <mach/mux.h>

#include <mach/serial.h>

#include <mach/time.h>



#include <clocksource/timer-davinci.h>



#include "asp.h"

#include "davinci.h"
@@ -501,15 +502,15 @@ static struct davinci_id dm646x_ids[] = { 
};



/*

 * T0_BOT: Timer 0, bottom:  clockevent source for hrtimers

 * T0_TOP: Timer 0, top   :  clocksource for generic timekeeping

 * T1_BOT: Timer 1, bottom:  (used by DSP in TI DSPLink code)

 * T1_TOP: Timer 1, top   :  <unused>

 * Bottom half of timer0 is used for clockevent, top half is used for

 * clocksource.

 */

static struct davinci_timer_info dm646x_timer_info = {

	.timers		= davinci_timer_instance,

	.clockevent_id	= T0_BOT,

	.clocksource_id	= T0_TOP,

static const struct davinci_timer_cfg dm646x_timer_cfg = {

	.reg = DEFINE_RES_IO(DAVINCI_TIMER0_BASE, SZ_4K),

	.irq = {

		DEFINE_RES_IRQ(DAVINCI_INTC_IRQ(IRQ_TINT0_TINT12)),

		DEFINE_RES_IRQ(DAVINCI_INTC_IRQ(IRQ_TINT0_TINT34)),

	},

};



static struct plat_serial8250_port dm646x_serial0_platform_data[] = {
@@ -587,7 +588,6 @@ static const struct davinci_soc_info davinci_soc_info_dm646x = { 
	.pinmux_base		= DAVINCI_SYSTEM_MODULE_BASE,

	.pinmux_pins		= dm646x_pins,

	.pinmux_pins_num	= ARRAY_SIZE(dm646x_pins),

	.timer_info		= &dm646x_timer_info,

	.emac_pdata		= &dm646x_emac_pdata,

	.sram_dma		= 0x10010000,

	.sram_len		= SZ_32K,
@@ -652,6 +652,7 @@ void __init dm646x_init_time(unsigned long ref_clk_rate, 
{

	void __iomem *pll1, *psc;

	struct clk *clk;

	int rv;



	clk_register_fixed_rate(NULL, "ref_clk", NULL, 0, ref_clk_rate);

	clk_register_fixed_rate(NULL, "aux_clkin", NULL, 0, aux_clkin_rate);
@@ -668,7 +669,8 @@ void __init dm646x_init_time(unsigned long ref_clk_rate, 
		return;

	}



	davinci_timer_init(clk);

	rv = davinci_timer_register(clk, &dm646x_timer_cfg);

	WARN(rv, "Unable to register the timer: %d\n", rv);

}



static struct resource dm646x_pll2_resources[] = {