diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2011-02-22 10:36:27 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-22 19:34:41 +0100 |
| commit | 3b03b58dab847883e6b9a431558c7d8e43fa94c6 (patch) | |
| tree | 14b6741a88ccfedb6ff9cb5efe58fa804e5f87d3 | |
| parent | OMAP4: hwmod data: Add rev and dev_attr fields in McSPI (diff) | |
| download | linux-3b03b58dab847883e6b9a431558c7d8e43fa94c6.tar.xz linux-3b03b58dab847883e6b9a431558c7d8e43fa94c6.zip | |
OMAP4: hwmod data: Prevent timer1 to be reset and idle during init
Since the timer1 is now started before the hwmod_init, we cannot
reset it and idle it anymore.
Add the appropriate flags to prevent the hwmod framework to do that.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 182aa79d5e52..79a860178913 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -3989,6 +3989,7 @@ 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", |