Skip to content

Commit

Permalink
[ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
Browse files Browse the repository at this point in the history
For suspend/resume to work, spitz needs pxa_pm_suspend/resume to be
called. Otherwise PSPR is not set properly, and system will die during
resume.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
  • Loading branch information
Pavel Machek authored and Eric Miao committed Jun 11, 2009
1 parent d5af277 commit 51cdd92
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions arch/arm/mach-pxa/include/mach/pm.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ extern void pxa27x_cpu_suspend(unsigned int);
extern void pxa_cpu_resume(void);

extern int pxa_pm_enter(suspend_state_t state);
extern int pxa_pm_prepare(void);
extern void pxa_pm_finish(void);

/* NOTE: this is for PM debugging on Lubbock, it's really a big
* ugly, but let's keep the crap minimum here, instead of direct
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-pxa/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static int pxa_pm_valid(suspend_state_t state)
return -EINVAL;
}

static int pxa_pm_prepare(void)
int pxa_pm_prepare(void)
{
int ret = 0;

Expand All @@ -89,7 +89,7 @@ static int pxa_pm_prepare(void)
return ret;
}

static void pxa_pm_finish(void)
void pxa_pm_finish(void)
{
if (pxa_cpu_pm_fns && pxa_cpu_pm_fns->finish)
pxa_cpu_pm_fns->finish();
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/mach-pxa/sharpsl_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -892,6 +892,8 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)

#ifdef CONFIG_PM
static struct platform_suspend_ops sharpsl_pm_ops = {
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
.valid = suspend_valid_only_mem,
};
Expand Down

0 comments on commit 51cdd92

Please sign in to comment.