ARM: OMAP2+: Drop useless gptimer option for omap4 (37238d3d) · Commits · 戴 / test

We have local timers on Cortex-A9, so using the gptimer option makes no sense. Let's just drop it for omap4 to simplify the timer options a bit. If this is really needed, it can be still done by specifying dts properties in the board specific file for assigned-clocks and assigned-clock-parents. This gets us a bit closer to start dropping legacy platform data for gptimers except for timer1 that is used for system clockevent. Cc: Keerthy <j-keerthy@ti.com> Cc: Tero Kristo <t-kristo@ti.com> Signed-off-by:

Tony Lindgren <tony@atomide.com>

arch/arm/mach-omap2/timer.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -545,7 +545,7 @@ static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src
	omap2_gp_clockevent_init(clkev_nr, clkev_src, clkev_prop);		omap2_gp_clockevent_init(clkev_nr, clkev_src, clkev_prop);

	/* Enable the use of clocksource="gp_timer" kernel parameter */		/* Enable the use of clocksource="gp_timer" kernel parameter */
	if (use_gptimer_clksrc \|\| gptimer)		if (clksrc_nr && (use_gptimer_clksrc \|\| gptimer))
	omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src,		omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src,
	clksrc_prop);		clksrc_prop);
	else		else
	@@ -586,7 +586,7 @@ void __init omap3_gptimer_timer_init(void)
	static void __init omap4_sync32k_timer_init(void)		static void __init omap4_sync32k_timer_init(void)
	{		{
	__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",		__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
	2, "sys_clkin_ck", NULL, false);		0, NULL, NULL, false);
	}		}

	void __init omap4_local_timer_init(void)		void __init omap4_local_timer_init(void)

Admin message