ARM: davinci: dm355: switch to using the clocksource driver (c0512c2c) · Commits · 戴 / test

arch/arm/mach-davinci/dm355.c

+13 −11

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,8 @@
	#include <mach/cputype.h>		#include <mach/cputype.h>
	#include <mach/mux.h>		#include <mach/mux.h>
	#include <mach/serial.h>		#include <mach/serial.h>
	#include <mach/time.h>
			#include <clocksource/timer-davinci.h>

	#include "asp.h"		#include "asp.h"
	#include "davinci.h"		#include "davinci.h"
	@@ -620,15 +621,15 @@ static struct davinci_id dm355_ids[] = {
	};		};

	/*		/*
	* T0_BOT: Timer 0, bottom: clockevent source for hrtimers		* Bottom half of timer0 is used for clockevent, top half is used for
	* T0_TOP: Timer 0, top : clocksource for generic timekeeping		* clocksource.
	* T1_BOT: Timer 1, bottom: (used by DSP in TI DSPLink code)
	* T1_TOP: Timer 1, top : <unused>
	*/		*/
	static struct davinci_timer_info dm355_timer_info = {		static const struct davinci_timer_cfg dm355_timer_cfg = {
	.timers = davinci_timer_instance,		.reg = DEFINE_RES_IO(DAVINCI_TIMER0_BASE, SZ_4K),
	.clockevent_id = T0_BOT,		.irq = {
	.clocksource_id = T0_TOP,		DEFINE_RES_IRQ(DAVINCI_INTC_IRQ(IRQ_TINT0_TINT12)),
			DEFINE_RES_IRQ(DAVINCI_INTC_IRQ(IRQ_TINT0_TINT34)),
			},
	};		};

	static struct plat_serial8250_port dm355_serial0_platform_data[] = {		static struct plat_serial8250_port dm355_serial0_platform_data[] = {
	@@ -706,7 +707,6 @@ static const struct davinci_soc_info davinci_soc_info_dm355 = {
	.pinmux_base = DAVINCI_SYSTEM_MODULE_BASE,		.pinmux_base = DAVINCI_SYSTEM_MODULE_BASE,
	.pinmux_pins = dm355_pins,		.pinmux_pins = dm355_pins,
	.pinmux_pins_num = ARRAY_SIZE(dm355_pins),		.pinmux_pins_num = ARRAY_SIZE(dm355_pins),
	.timer_info = &dm355_timer_info,
	.sram_dma = 0x00010000,		.sram_dma = 0x00010000,
	.sram_len = SZ_32K,		.sram_len = SZ_32K,
	};		};
	@@ -733,6 +733,7 @@ void __init dm355_init_time(void)
	{		{
	void __iomem pll1, psc;		void __iomem pll1, psc;
	struct clk *clk;		struct clk *clk;
			int rv;

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

	@@ -748,7 +749,8 @@ void __init dm355_init_time(void)
	return;		return;
	}		}

	davinci_timer_init(clk);		rv = davinci_timer_register(clk, &dm355_timer_cfg);
			WARN(rv, "Unable to register the timer: %d\n", rv);
	}		}

	static struct resource dm355_pll2_resources[] = {		static struct resource dm355_pll2_resources[] = {

Admin message