[U-Boot] [PATCH] PXA: FIX: Deep-sleep return address in stored in PSPR

[U-Boot] [PATCH] PXA: FIX: Deep-sleep return address in stored in PSPR

[Marek Vasut]

FIX for a typo-bug: The address is stored in PSPR, not PSSR.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
 arch/arm/cpu/pxa/cpu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/cpu/pxa/cpu.c b/arch/arm/cpu/pxa/cpu.c
index 7d49cbb..3bc0525 100644
--- a/arch/arm/cpu/pxa/cpu.c
+++ b/arch/arm/cpu/pxa/cpu.c
@@ -305,7 +305,7 @@ void pxa_wakeup(void)
 		pxa_dram_init();
 		icache_disable();
 		dcache_disable();
-		asm volatile("mov	pc, %0"::"r"(readl(PSSR)));
+		asm volatile("mov	pc, %0"::"r"(readl(PSPR)));
 	}
 }
 
-- 
1.7.5.4

[U-Boot] [PATCH] PXA: FIX: Deep-sleep return address in stored in PSPR

[Marek Vasut]

On Wednesday, September 07, 2011 03:25:45 PM Marek Vasut wrote:
> FIX for a typo-bug: The address is stored in PSPR, not PSSR.
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
>  arch/arm/cpu/pxa/cpu.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 

Albert, this is actually a resend of a very old patch. I dunno why it didn't get 
into mainline, but it really SHOULD be picked up.

Also, can you please just merge it without pull rq?

Thanks!

> diff --git a/arch/arm/cpu/pxa/cpu.c b/arch/arm/cpu/pxa/cpu.c
> index 7d49cbb..3bc0525 100644
> --- a/arch/arm/cpu/pxa/cpu.c
> +++ b/arch/arm/cpu/pxa/cpu.c
> @@ -305,7 +305,7 @@ void pxa_wakeup(void)
>  		pxa_dram_init();
>  		icache_disable();
>  		dcache_disable();
> -		asm volatile("mov	pc, %0"::"r"(readl(PSSR)));
> +		asm volatile("mov	pc, %0"::"r"(readl(PSPR)));
>  	}
>  }

[U-Boot] [PATCH] PXA: FIX: Deep-sleep return address in stored in PSPR

[Albert ARIBAUD]

Hi Marek,

Le 07/09/2011 15:26, Marek Vasut a ?crit :
> On Wednesday, September 07, 2011 03:25:45 PM Marek Vasut wrote:
>> FIX for a typo-bug: The address is stored in PSPR, not PSSR.
>>
>> Signed-off-by: Marek Vasut<marek.vasut@gmail.com>
>> ---
>>   arch/arm/cpu/pxa/cpu.c |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>
> Albert, this is actually a resend of a very old patch. I dunno why it didn't get
> into mainline, but it really SHOULD be picked up.
>
> Also, can you please just merge it without pull rq?

You mean apply it to u-boot-arm/master directly ? I can, but if you want 
it applied ASAP, maybe you should ask that Wolfgang apply it to 
u-boot/master directly.

Amicalement,
-- 
Albert.

[U-Boot] [PATCH] PXA: FIX: Deep-sleep return address in stored in PSPR

[Marek Vasut]

On Wednesday, September 07, 2011 04:23:19 PM Albert ARIBAUD wrote:
> Hi Marek,
> 
> Le 07/09/2011 15:26, Marek Vasut a ?crit :
> > On Wednesday, September 07, 2011 03:25:45 PM Marek Vasut wrote:
> >> FIX for a typo-bug: The address is stored in PSPR, not PSSR.
> >> 
> >> Signed-off-by: Marek Vasut<marek.vasut@gmail.com>
> >> ---
> >> 
> >>   arch/arm/cpu/pxa/cpu.c |    2 +-
> >>   1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > Albert, this is actually a resend of a very old patch. I dunno why it
> > didn't get into mainline, but it really SHOULD be picked up.
> > 
> > Also, can you please just merge it without pull rq?
> 
> You mean apply it to u-boot-arm/master directly ? I can, but if you want
> it applied ASAP, maybe you should ask that Wolfgang apply it to
> u-boot/master directly.

It's a bugfix that wasn't applied for six months ... AND noone complained. It 
means 1) PXA is dead and noone cares 2) it's in no hurry.

Wolfgang, if you feel like applying it to master, please do.

> 
> Amicalement,

[U-Boot] [PATCH] PXA: FIX: Deep-sleep return address in stored in PSPR

[Wolfgang Denk]

Dear Marek Vasut,

In message <1315401946-17065-1-git-send-email-marek.vasut@gmail.com> you wrote:
> FIX for a typo-bug: The address is stored in PSPR, not PSSR.
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
>  arch/arm/cpu/pxa/cpu.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Put your Nose to the Grindstone!
                 -- Amalgamated Plastic Surgeons and Toolmakers, Ltd.