diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-04 00:27:56 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-04 00:27:56 +0400 |
| commit | 038485ea9b66858c17f82e5393004532825106a7 (patch) | |
| tree | e411be1686e4ed73c4f74f0388410231d26e5c76 /arch/arm/mach-imx/pm-imx6q.c | |
| parent | 5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72 (diff) | |
| parent | 8b69791215857e3e885d27b3945759ace820794a (diff) | |
| download | linux-038485ea9b66858c17f82e5393004532825106a7.tar.xz | |
Merge branch 'imx6/pm' into next/pm
* imx6/pm:
ARM: imx6q: resume PL310 only when CACHE_L2X0 defined
ARM: imx6q: build pm code only when CONFIG_PM selected
ARM: mx5: use generic irq chip pm interface for pm functions on
Diffstat (limited to 'arch/arm/mach-imx/pm-imx6q.c')
| -rw-r--r-- | arch/arm/mach-imx/pm-imx6q.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c index f20f191d7cca..f7b0c2b1b905 100644 --- a/arch/arm/mach-imx/pm-imx6q.c +++ b/arch/arm/mach-imx/pm-imx6q.c @@ -64,7 +64,9 @@ void __init imx6q_pm_init(void) * address of the data structure used by l2x0 core to save registers, * and later restore the necessary ones in imx6q resume entry. */ +#ifdef CONFIG_CACHE_L2X0 phys_l2x0_saved_regs = __pa(&l2x0_saved_regs); +#endif suspend_set_ops(&imx6q_pm_ops); } |