Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ea59bb3 authored by Imre Deak's avatar Imre Deak Committed by Tony Lindgren
Browse files

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: default avatarImre Deak <imre.deak@solidboot.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent df2c2e70

arch/arm/mach-omap1/pm.c

+1 −4
Original line number Diff line number Diff line
@@ -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.

arch/arm/plat-omap/dma.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

include/asm-arm/arch-omap/dma.h

+0 −1
Original line number Diff line number Diff line
@@ -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,