[PATCH] ARM: pxa: pxa2xx use PSPR for resume address

[PATCH] ARM: pxa: pxa2xx use PSPR for resume address

[Robert Jarzmik]

Both lubbock and mainstone suspend to RAM were broken by the same
typo. The linux kernel saves the resume address to PSPR, ie. the scratch
pad register, while it was PSSR which was checked in barebox.

Fixing this typo was tested on mainstone where resume from S3 works.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
 arch/arm/boards/lubbock/lowlevel.c   | 2 +-
 arch/arm/boards/mainstone/lowlevel.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/lubbock/lowlevel.c b/arch/arm/boards/lubbock/lowlevel.c
index 3c8ae76..1c52b3e 100644
--- a/arch/arm/boards/lubbock/lowlevel.c
+++ b/arch/arm/boards/lubbock/lowlevel.c
@@ -171,7 +171,7 @@ static inline void pxa2xx_dram_init(void)
 
 void __bare_init __naked barebox_arm_reset_vector(void)
 {
-	unsigned long pssr = PSSR;
+	unsigned long pssr = PSPR;
 	unsigned long pc = get_pc();
 
 	arm_cpu_lowlevel_init();
diff --git a/arch/arm/boards/mainstone/lowlevel.c b/arch/arm/boards/mainstone/lowlevel.c
index 86bb09c..8983941 100644
--- a/arch/arm/boards/mainstone/lowlevel.c
+++ b/arch/arm/boards/mainstone/lowlevel.c
@@ -243,7 +243,7 @@ static inline void pxa2xx_dram_init(void)
 
 void __bare_init __naked barebox_arm_reset_vector(void)
 {
-	unsigned long pssr = PSSR;
+	unsigned long pssr = PSPR;
 	unsigned long pc = get_pc();
 
 	arm_cpu_lowlevel_init();
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ARM: pxa: pxa2xx use PSPR for resume address

[Sascha Hauer]

On Sat, Dec 05, 2015 at 11:37:05PM +0100, Robert Jarzmik wrote:
> Both lubbock and mainstone suspend to RAM were broken by the same
> typo. The linux kernel saves the resume address to PSPR, ie. the scratch
> pad register, while it was PSSR which was checked in barebox.
> 
> Fixing this typo was tested on mainstone where resume from S3 works.
> 
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
> ---
>  arch/arm/boards/lubbock/lowlevel.c   | 2 +-
>  arch/arm/boards/mainstone/lowlevel.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox