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

Commit 582c77d7 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'pm-next-2' of... 

Merge branch 'pm-next-2' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
parents bead4375 ebfa88cf

arch/arm/mach-omap2/cpuidle34xx.c

+1 −3
Original line number Diff line number Diff line
@@ -272,10 +272,8 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev, 
	 */

	per_next_state = per_saved_state = pwrdm_read_next_pwrst(per_pd);

	if ((per_next_state == PWRDM_POWER_OFF) &&

	    (core_next_state > PWRDM_POWER_RET)) {

	    (core_next_state > PWRDM_POWER_RET))

		per_next_state = PWRDM_POWER_RET;

		pwrdm_set_next_pwrst(per_pd, per_next_state);

	}



	/* Are we changing PER target state? */

	if (per_next_state != per_saved_state)

arch/arm/mach-omap2/pm.h

+4 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 


#include <plat/powerdomain.h>



extern u32 enable_off_mode;

extern u32 sleep_while_idle;



extern void *omap3_secure_ram_storage;

extern void omap3_pm_off_mode_enable(int);

extern void omap_sram_idle(void);
@@ -50,10 +47,14 @@ extern struct omap_dm_timer *gptimer_wakeup; 
extern void omap2_pm_dump(int mode, int resume, unsigned int us);

extern void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds);

extern int omap2_pm_debug;

extern u32 enable_off_mode;

extern u32 sleep_while_idle;

#else

#define omap2_pm_dump(mode, resume, us)		do {} while (0);

#define omap2_pm_wakeup_on_timer(seconds, milliseconds)	do {} while (0);

#define omap2_pm_debug				0

#define enable_off_mode 0

#define sleep_while_idle 0

#endif



#if defined(CONFIG_CPU_IDLE)