linux-ti33x-psp 3.2: backport PM and USB fixes from PSP
[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / psp / 0005-ARM-OMAP-AM33XX-PM-Wait-correctly-for-the-PLLs-to-re.patch
1 From a7cfe5e7b86ebba4aa184b2612c4ecb70a01aa02 Mon Sep 17 00:00:00 2001
2 From: "Satyanarayana, Sandhya" <sandhya.satyanarayana@ti.com>
3 Date: Tue, 22 May 2012 12:33:20 +0530
4 Subject: [PATCH 05/18] ARM: OMAP: AM33XX: PM: Wait correctly for the PLLs to
5  relock in the sleep code
7 The PLL relock code was incorrectly exiting the loop
8 before the PLLs relock. Since the PLLs relock within
9 a couple of A8 assembly instruction execution this went
10 unnoticed till now. The issue was noticed when validating
11 the abort path of the suspend process wherein the
12 incorrect check for PLL relock resulted in a lockup.
14 Signed-off-by: Satyanarayana, Sandhya <sandhya.satyanarayana@ti.com>
15 Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
16 ---
17  arch/arm/mach-omap2/sleep33xx.S |    4 ++--
18  1 files changed, 2 insertions(+), 2 deletions(-)
20 diff --git a/arch/arm/mach-omap2/sleep33xx.S b/arch/arm/mach-omap2/sleep33xx.S
21 index b7a1612..79a9e39 100644
22 --- a/arch/arm/mach-omap2/sleep33xx.S
23 +++ b/arch/arm/mach-omap2/sleep33xx.S
24 @@ -61,8 +61,8 @@ pll_lock_\name:
25         ldr     r0, \idlest_addr
26  wait_pll_lock_\name:
27         ldr     r1, [r0]
28 -       tst     r1, #0x1
29 -       bne     wait_pll_lock_\name
30 +       ands    r1, #0x1
31 +       beq     wait_pll_lock_\name
32         .endm
33  
34         /* EMIF config for low power mode */
35 -- 
36 1.7.7.6