diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap1/pm.c | 5 | ||||
-rw-r--r-- | arch/arm/plat-omap/dma.c | 6 |
2 files changed, 1 insertions, 10 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) | |||
153 | use_idlect1 = omap_dm_timer_modify_idlect_mask(use_idlect1); | 153 | use_idlect1 = omap_dm_timer_modify_idlect_mask(use_idlect1); |
154 | #endif | 154 | #endif |
155 | 155 | ||
156 | if (omap_dma_running()) { | 156 | if (omap_dma_running()) |
157 | use_idlect1 &= ~(1 << 6); | 157 | use_idlect1 &= ~(1 << 6); |
158 | if (omap_lcd_dma_ext_running()) | ||
159 | use_idlect1 &= ~(1 << 12); | ||
160 | } | ||
161 | 158 | ||
162 | /* We should be able to remove the do_sleep variable and multiple | 159 | /* We should be able to remove the do_sleep variable and multiple |
163 | * tests above as soon as drivers, timer and DMA code have been fixed. | 160 | * tests above as soon as drivers, timer and DMA code have been fixed. |
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 88d5b6d9f950..05a38498cbe0 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -1347,11 +1347,6 @@ void omap_stop_lcd_dma(void) | |||
1347 | omap_writew(w, OMAP1610_DMA_LCD_CTRL); | 1347 | omap_writew(w, OMAP1610_DMA_LCD_CTRL); |
1348 | } | 1348 | } |
1349 | 1349 | ||
1350 | int omap_lcd_dma_ext_running(void) | ||
1351 | { | ||
1352 | return lcd_dma.ext_ctrl && lcd_dma.active; | ||
1353 | } | ||
1354 | |||
1355 | /*----------------------------------------------------------------------------*/ | 1350 | /*----------------------------------------------------------------------------*/ |
1356 | 1351 | ||
1357 | static int __init omap_init_dma(void) | 1352 | static int __init omap_init_dma(void) |
@@ -1493,7 +1488,6 @@ EXPORT_SYMBOL(omap_free_lcd_dma); | |||
1493 | EXPORT_SYMBOL(omap_enable_lcd_dma); | 1488 | EXPORT_SYMBOL(omap_enable_lcd_dma); |
1494 | EXPORT_SYMBOL(omap_setup_lcd_dma); | 1489 | EXPORT_SYMBOL(omap_setup_lcd_dma); |
1495 | EXPORT_SYMBOL(omap_stop_lcd_dma); | 1490 | EXPORT_SYMBOL(omap_stop_lcd_dma); |
1496 | EXPORT_SYMBOL(omap_lcd_dma_ext_running); | ||
1497 | EXPORT_SYMBOL(omap_set_lcd_dma_b1); | 1491 | EXPORT_SYMBOL(omap_set_lcd_dma_b1); |
1498 | EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer); | 1492 | EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer); |
1499 | EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller); | 1493 | EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller); |