Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 07:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: mx53: Allow suspend/resume

Browse Source 
Current imx53_pm_init() implementation is incomplete as it lacks calling
suspend_set_ops().

Use a single imx5_pm_init() function to handle both mx51 and mx53.

This allows mx53 to enter in low-power mode.

Tested on a mx53qsb:

root@freescale /$ echo mem > /sys/power/state
PM: Syncing filesystems ... done.
mmc0: card e624 removed
Freezing user space processes ... (elapsed 0.001 seconds) done.
Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done.
Suspending console(s) (use no_console_suspend to debug)

... (Press Power button)

PM: suspend of devices complete after 17.067 msecs
PM: suspend devices took 0.020 seconds
PM: late suspend of devices complete after 0.954 msecs
PM: noirq suspend of devices complete after 1.288 msecs
Disabling non-boot CPUs ...
PM: noirq resume of devices complete after 0.680 msecs
PM: early resume of devices complete after 0.914 msecs
PM: resume of devices complete after 44.955 msecs
PM: resume devices took 0.050 seconds
Restarting tasks ... done.
mmc0: host does not support reading read-only switch. assuming write-enable.
mmc0: new SDHC card at address e624
mmcblk0: mmc0:e624 SU04G 3.69 GiB
 mmcblk0: p1 p2 p3
libphy: 63fec000.etherne:00 - Link is Down
libphy: 63fec000.etherne:00 - Link is Up - 100/Full
root@freescale /$

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
Fabio Estevam 2013-07-26 00:17:36 -03:00 committed by Shawn Guo
parent f36b594f37
commit 547dd1e089
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-imx/common.h
View File

@ -147,12 +147,10 @@ extern int imx_cpu_kill(unsigned int cpu);
#ifdef CONFIG_PM #ifdef CONFIG_PM
extern void imx6q_pm_init(void); extern void imx6q_pm_init(void);
extern void imx51_pm_init(void); extern void imx5_pm_init(void);
extern void imx53_pm_init(void);
#else #else
static inline void imx6q_pm_init(void) {} static inline void imx6q_pm_init(void) {}
static inline void imx51_pm_init(void) {} static inline void imx5_pm_init(void) {}
static inline void imx53_pm_init(void) {}
#endif #endif
#ifdef CONFIG_NEON #ifdef CONFIG_NEON

4
arch/arm/mach-imx/mm-imx5.c
View File

@ -153,10 +153,10 @@ void __init imx51_soc_init(void)
void __init imx51_init_late(void) void __init imx51_init_late(void)
{ {
mx51_neon_fixup(); mx51_neon_fixup();
imx51_pm_init(); imx5_pm_init();
} }
void __init imx53_init_late(void) void __init imx53_init_late(void)
{ {
imx53_pm_init(); imx5_pm_init();
} }

7
arch/arm/mach-imx/pm-imx5.c
View File

@ -169,14 +169,9 @@ static int __init imx5_pm_common_init(void)
return imx5_cpuidle_init(); return imx5_cpuidle_init();
} }
void __init imx51_pm_init(void) void __init imx5_pm_init(void)
{ {
int ret = imx5_pm_common_init(); int ret = imx5_pm_common_init();
if (!ret) if (!ret)
suspend_set_ops(&mx5_suspend_ops); suspend_set_ops(&mx5_suspend_ops);
} }
void __init imx53_pm_init(void)
{
imx5_pm_common_init();
}