lkml.org 
[lkml]   [2007]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 71/90] ARM: OMAP: add SoSSI clock (remove manual checking of SoSSI state from idle)
    Date
    From: Imre Deak <imre.deak@solidboot.com>

    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>
    ---
    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(-)

    diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
    index 49efe90..743029a 100644
    --- a/arch/arm/mach-omap1/pm.c
    +++ b/arch/arm/mach-omap1/pm.c
    @@ -155,11 +155,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.
    diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
    index 2d86b10..c64785e 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)
    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);
    diff --git a/include/asm-arm/arch-omap/dma.h b/include/asm-arm/arch-omap/dma.h
    index d591d05..d2701d8 100644
    --- a/include/asm-arm/arch-omap/dma.h
    +++ b/include/asm-arm/arch-omap/dma.h
    @@ -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,
    --
    1.4.4.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-04-04 20:29    [W:4.023 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site