lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: OMAP: add SoSSI clock (remove manual checking of SoSSI state from idle)

Browse Source 
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>
This commit is contained in:
Imre Deak
2007-03-05 17:34:05 +02:00
committed by Tony Lindgren
parent df2c2e70f0
commit 6ea59bb308
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-omap1/pm.c
View File

@@ -153,11 +153,8 @@ void omap_pm_idle(void)
use_idlect1 = omap_dm_timer_modify_idlect_mask(use_idlect1); use_idlect1 = omap_dm_timer_modify_idlect_mask(use_idlect1);
#endif #endif
if (omap_dma_running()) { if (omap_dma_running())
use_idlect1 &= ~(1 << 6); 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 /* 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. * tests above as soon as drivers, timer and DMA code have been fixed.

6
arch/arm/plat-omap/dma.c
View File

@@ -1347,11 +1347,6 @@ void omap_stop_lcd_dma(void)
omap_writew(w, OMAP1610_DMA_LCD_CTRL); 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) 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_enable_lcd_dma);
EXPORT_SYMBOL(omap_setup_lcd_dma); EXPORT_SYMBOL(omap_setup_lcd_dma);
EXPORT_SYMBOL(omap_stop_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_b1);
EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer); EXPORT_SYMBOL(omap_set_lcd_dma_single_transfer);
EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller); EXPORT_SYMBOL(omap_set_lcd_dma_ext_controller);

1
include/asm-arm/arch-omap/dma.h
View File

@@ -417,7 +417,6 @@ extern void omap_free_lcd_dma(void);
extern void omap_setup_lcd_dma(void); extern void omap_setup_lcd_dma(void);
extern void omap_enable_lcd_dma(void); extern void omap_enable_lcd_dma(void);
extern void omap_stop_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_ext_controller(int external);
extern void omap_set_lcd_dma_single_transfer(int single); 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, extern void omap_set_lcd_dma_b1(unsigned long addr, u16 fb_xres, u16 fb_yres,