From 13914bd8523bdedfa1d40d55b4755f097b824749 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Mon, 5 Mar 2007 17:34:05 +0200 Subject: [PATCH 4/6] 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 Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/pm.c | 5 +---- arch/arm/plat-omap/dma.c | 6 ------ include/asm-arm/arch-omap/dma.h | 1 - 3 files changed, 1 insertions(+), 11 deletions(-) Index: linux-omap-2.6/arch/arm/mach-omap1/pm.c =================================================================== --- linux-omap-2.6.orig/arch/arm/mach-omap1/pm.c 2007-05-16 09:37:47.000000000 -0700 +++ linux-omap-2.6/arch/arm/mach-omap1/pm.c 2007-05-16 09:49:02.000000000 -0700 @@ -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. Index: linux-omap-2.6/arch/arm/plat-omap/dma.c =================================================================== --- linux-omap-2.6.orig/arch/arm/plat-omap/dma.c 2007-05-16 09:36:55.000000000 -0700 +++ linux-omap-2.6/arch/arm/plat-omap/dma.c 2007-05-16 09:49:02.000000000 -0700 @@ -1347,11 +1347,6 @@ void omap_stop_lcd_dma(void) omap_writew(w, OMAP1610_DMA_LCD_CTRL); } -int omap_lcd_dma_ext_running(void) -{ - return lcd_dma.ext_ctrl && lcd_dma.active; -} - /*----------------------------------------------------------------------------*/ static int __init omap_init_dma(void) @@ -1493,7 +1488,6 @@ EXPORT_SYMBOL(omap_free_lcd_dma); EXPORT_SYMBOL(omap_enable_lcd_dma); EXPORT_SYMBOL(omap_setup_lcd_dma); EXPORT_SYMBOL(omap_stop_lcd_dma); -EXPORT_SYMBOL(omap_lcd_dma_ext_running); EXPORT_SYMBOL(omap_set_lcd_dma_b1); EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer); EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller); Index: linux-omap-2.6/include/asm-arm/arch-omap/dma.h =================================================================== --- linux-omap-2.6.orig/include/asm-arm/arch-omap/dma.h 2007-05-16 09:36:55.000000000 -0700 +++ linux-omap-2.6/include/asm-arm/arch-omap/dma.h 2007-05-16 09:49:02.000000000 -0700 @@ -417,7 +417,6 @@ extern void omap_free_lcd_dma(void); extern void omap_setup_lcd_dma(void); extern void omap_enable_lcd_dma(void); extern void omap_stop_lcd_dma(void); -extern int omap_lcd_dma_ext_running(void); extern void omap_set_lcd_dma_ext_controller(int external); extern void omap_set_lcd_dma_single_transfer(int single); extern void omap_set_lcd_dma_b1(unsigned long addr, u16 fb_xres, u16 fb_yres,