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

Commit 2bbe3af3 authored by Tero Kristo's avatar Tero Kristo Committed by Kevin Hilman
Browse files

OMAP3: PM: Ack pending interrupts before entering suspend 



Suspending drivers may still generate interrupts just before their suspend is
completed. Any pending interrupts here will prevent sleep.

Signed-off-by: default avatarTero Kristo <tero.kristo@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 7284ce6c

arch/arm/mach-omap2/irq.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -274,4 +274,10 @@ void omap_intc_restore_context(void) 
	}

	}

	/* MIRs are saved and restore with other PRCM registers */

	/* MIRs are saved and restore with other PRCM registers */

}

}



void omap3_intc_suspend(void)

{

	/* A pending interrupt would prevent OMAP from entering suspend */

	omap_ack_irq(0);

}

#endif /* CONFIG_ARCH_OMAP3 */
 
#endif /* CONFIG_ARCH_OMAP3 */

arch/arm/mach-omap2/pm34xx.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -578,6 +578,8 @@ static int omap3_pm_suspend(void) 
	}

	}





	omap_uart_prepare_suspend();

	omap_uart_prepare_suspend();

	omap3_intc_suspend();



	omap_sram_idle();

	omap_sram_idle();





restore:

restore:

arch/arm/plat-omap/include/plat/irqs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -499,6 +499,7 @@ extern void omap_init_irq(void); 
extern int omap_irq_pending(void);

extern int omap_irq_pending(void);

void omap_intc_save_context(void);

void omap_intc_save_context(void);

void omap_intc_restore_context(void);

void omap_intc_restore_context(void);

void omap3_intc_suspend(void);

#endif

#endif





#include <mach/hardware.h>

#include <mach/hardware.h>