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

Commit 8e2efde9 authored by Ari Kauppi's avatar Ari Kauppi Committed by Kevin Hilman
Browse files

OMAP3: PM: Add milliseconds interface to suspend wakeup timer 



Millisecond resolution is possible and there are use cases for it
(automatic testing).

Seconds-based interface is preserved for compatibility.

Signed-off-by: default avatarAri Kauppi <Ext-Ari.Kauppi@nokia.com>
Reviewed-by: default avatarPhil Carmody <ext-phil.2.carmody@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent d6290a3e

arch/arm/mach-omap2/pm-debug.c

+3 −0
Original line number Diff line number Diff line
@@ -548,6 +548,9 @@ static int option_set(void *data, u64 val) 
{

	u32 *option = data;



	if (option == &wakeup_timer_milliseconds && val >= 1000)

		return -EINVAL;



	*option = val;



	if (option == &enable_off_mode)

arch/arm/mach-omap2/pm.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm); 
extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);



extern u32 wakeup_timer_seconds;

extern u32 wakeup_timer_milliseconds;

extern struct omap_dm_timer *gptimer_wakeup;



#ifdef CONFIG_PM_DEBUG

arch/arm/mach-omap2/pm34xx.c

+10 −7
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
u32 enable_off_mode;

u32 sleep_while_idle;

u32 wakeup_timer_seconds;

u32 wakeup_timer_milliseconds;



struct power_state {

	struct powerdomain *pwrdm;
@@ -555,20 +556,21 @@ static void omap3_pm_idle(void) 
#ifdef CONFIG_SUSPEND

static suspend_state_t suspend_state;



static void omap2_pm_wakeup_on_timer(u32 seconds)

static void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds)

{

	u32 tick_rate, cycles;



	if (!seconds)

	if (!seconds && !milliseconds)

		return;



	tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gptimer_wakeup));

	cycles = tick_rate * seconds;

	cycles = tick_rate * seconds + tick_rate * milliseconds / 1000;

	omap_dm_timer_stop(gptimer_wakeup);

	omap_dm_timer_set_load_start(gptimer_wakeup, 0, 0xffffffff - cycles);



	pr_info("PM: Resume timer in %d secs (%d ticks at %d ticks/sec.)\n",

		seconds, cycles, tick_rate);

	pr_info("PM: Resume timer in %u.%03u secs"

		" (%d ticks at %d ticks/sec.)\n",

		seconds, milliseconds, cycles, tick_rate);

}



static int omap3_pm_prepare(void)
@@ -582,8 +584,9 @@ static int omap3_pm_suspend(void) 
	struct power_state *pwrst;

	int state, ret = 0;



	if (wakeup_timer_seconds)

		omap2_pm_wakeup_on_timer(wakeup_timer_seconds);

	if (wakeup_timer_seconds || wakeup_timer_milliseconds)

		omap2_pm_wakeup_on_timer(wakeup_timer_seconds,

					 wakeup_timer_milliseconds);



	/* Read current next_pwrsts */

	list_for_each_entry(pwrst, &pwrst_list, node)