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

Commit cd97bb00 authored by Benoit Cousson's avatar Benoit Cousson Committed by Tony Lindgren
Browse files

Revert "OMAP4: hwmod data: Prevent timer1 to be reset and idle during init" 



The following commit: 38698bef:
OMAP2+: clockevent: set up GPTIMER clockevent hwmod right before timer init

Fixed properly the issue with early init for the timer1

So reverts commit 3b03b58d that is now
generated a warning at boot time.

Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Reviewed-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b2833a05

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+0 −1
Original line number Diff line number Diff line
@@ -4005,7 +4005,6 @@ static struct omap_hwmod_ocp_if *omap44xx_timer1_slaves[] = { 
static struct omap_hwmod omap44xx_timer1_hwmod = {

	.name		= "timer1",

	.class		= &omap44xx_timer_1ms_hwmod_class,

	.flags		= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,

	.mpu_irqs	= omap44xx_timer1_irqs,

	.mpu_irqs_cnt	= ARRAY_SIZE(omap44xx_timer1_irqs),

	.main_clk	= "timer1_fck",