summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorImre Deak <imre.deak@solidboot.com>2007-03-05 16:34:05 +0100
committerTony Lindgren <tony@atomide.com>2007-09-21 03:34:49 +0200
commit6ea59bb3083dea3b48003ea49de12a3e3c868b05 (patch)
treee449fe4fdb27675c9bf3682ab09941beec96bb21 /arch/arm/mach-omap1
parentARM: OMAP: add SoSSI clock (diff)
downloadlinux-6ea59bb3083dea3b48003ea49de12a3e3c868b05.tar.xz
linux-6ea59bb3083dea3b48003ea49de12a3e3c868b05.zip
ARM: OMAP: add SoSSI clock (remove manual checking of SoSSI state from idle)
The SoSSI driver should already take care of this by enabling / disabling its clock when necessary, so this legacy callout from the PM idle code is not needed any more. Signed-off-by: Imre Deak <imre.deak@solidboot.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r--arch/arm/mach-omap1/pm.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 2e68be607295..089b8208de0e 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -153,11 +153,8 @@ void omap_pm_idle(void)
use_idlect1 = omap_dm_timer_modify_idlect_mask(use_idlect1);
#endif
- if (omap_dma_running()) {
+ if (omap_dma_running())
use_idlect1 &= ~(1 << 6);
- if (omap_lcd_dma_ext_running())
- use_idlect1 &= ~(1 << 12);
- }
/* We should be able to remove the do_sleep variable and multiple
* tests above as soon as drivers, timer and DMA code have been fixed.