diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-06-16 08:12:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-10 12:49:35 -0400 |
commit | 301773b62355e8a6028a8023be2d04c7317915d9 (patch) | |
tree | 5bc5a181372792c718e30421ea1c691bc075b67d /arch | |
parent | 3544f27efa25890516158c8e13d21e878969d125 (diff) |
ARM: mvebu: fix suspend to RAM on big-endian configurations
commit 2f5bc307be2480ba89e4c5d118f406f04a4a7299 upstream.
The current Armada XP suspend to RAM implementation, as added in
commit 27432825ae19f ("ARM: mvebu: Armada XP GP specific
suspend/resume code") does not handle big-endian configurations
properly: the small bit of assembly code putting the DRAM in
self-refresh and toggling the GPIOs to turn off power forgets to
convert the values to little-endian.
This commit fixes that by making sure the two values we will write to
the DRAM controller register and GPIO register are already in
little-endian before entering the critical assembly code.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Fixes: 27432825ae19f ("ARM: mvebu: Armada XP GP specific suspend/resume code")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mvebu/pm-board.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/pm-board.c b/arch/arm/mach-mvebu/pm-board.c index 6dfd4ab97b2a..301ab38d38ba 100644 --- a/arch/arm/mach-mvebu/pm-board.c +++ b/arch/arm/mach-mvebu/pm-board.c | |||
@@ -43,6 +43,9 @@ static void mvebu_armada_xp_gp_pm_enter(void __iomem *sdram_reg, u32 srcmd) | |||
43 | for (i = 0; i < ARMADA_XP_GP_PIC_NR_GPIOS; i++) | 43 | for (i = 0; i < ARMADA_XP_GP_PIC_NR_GPIOS; i++) |
44 | ackcmd |= BIT(pic_raw_gpios[i]); | 44 | ackcmd |= BIT(pic_raw_gpios[i]); |
45 | 45 | ||
46 | srcmd = cpu_to_le32(srcmd); | ||
47 | ackcmd = cpu_to_le32(ackcmd); | ||
48 | |||
46 | /* | 49 | /* |
47 | * Wait a while, the PIC needs quite a bit of time between the | 50 | * Wait a while, the PIC needs quite a bit of time between the |
48 | * two GPIO commands. | 51 | * two GPIO commands. |