mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-14 15:54:15 +08:00
[ARM] 4597/2: OSIRIS: ensure CPLD0 is preserved after suspend
Ensure that CPLD is restored to the original state on resume, and that before going into suspend we select the NAND bank we booted from for restarting. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
804b3f9a16
commit
28047eced8
@ -276,7 +276,17 @@ static unsigned char pm_osiris_ctrl0;
|
||||
|
||||
static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)
|
||||
{
|
||||
unsigned int tmp;
|
||||
|
||||
pm_osiris_ctrl0 = __raw_readb(OSIRIS_VA_CTRL0);
|
||||
tmp = pm_osiris_ctrl0 & ~OSIRIS_CTRL0_NANDSEL;
|
||||
|
||||
/* ensure correct NAND slot is selected on resume */
|
||||
if ((pm_osiris_ctrl0 & OSIRIS_CTRL0_BOOT_INT) == 0)
|
||||
tmp |= 2;
|
||||
|
||||
__raw_writeb(tmp, OSIRIS_VA_CTRL0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -285,6 +295,8 @@ static int osiris_pm_resume(struct sys_device *sd)
|
||||
if (pm_osiris_ctrl0 & OSIRIS_CTRL0_FIX8)
|
||||
__raw_writeb(OSIRIS_CTRL1_FIX8, OSIRIS_VA_CTRL1);
|
||||
|
||||
__raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user