From d712ffe24feb76c7cfa6b78745f170e52eb5eba5 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Mon, 21 May 2007 18:09:16 +0800 Subject: [PATCH] --- yaml --- r: 56641 b: refs/heads/master c: d1b945fdb62f3e6852fea5a8779c0151ac1e55a8 h: refs/heads/master i: 56639: c36ded5cca4d770c2eedebdde260a9c7296fbbd0 v: v3 --- [refs] | 2 +- trunk/include/asm-blackfin/mach-bf533/cdefBF532.h | 6 ++++-- trunk/include/asm-blackfin/mach-bf537/cdefBF534.h | 6 ++++-- trunk/include/asm-blackfin/mach-bf561/cdefBF561.h | 6 ++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 94c7eb2756d6..802a534cdbe0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ae246cd85e05d3fb31b9770588c1fe0914872fe +refs/heads/master: d1b945fdb62f3e6852fea5a8779c0151ac1e55a8 diff --git a/trunk/include/asm-blackfin/mach-bf533/cdefBF532.h b/trunk/include/asm-blackfin/mach-bf533/cdefBF532.h index 1d7c494ceb64..521bdb4d297d 100644 --- a/trunk/include/asm-blackfin/mach-bf533/cdefBF532.h +++ b/trunk/include/asm-blackfin/mach-bf533/cdefBF532.h @@ -63,12 +63,14 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val) { unsigned long flags, iwr; - bfin_write16(VR_CTL, val); - __builtin_bfin_ssync(); /* Enable the PLL Wakeup bit in SIC IWR */ iwr = bfin_read32(SIC_IWR); /* Only allow PPL Wakeup) */ bfin_write32(SIC_IWR, IWR_ENABLE(0)); + + bfin_write16(VR_CTL, val); + __builtin_bfin_ssync(); + local_irq_save(flags); asm("IDLE;"); local_irq_restore(flags); diff --git a/trunk/include/asm-blackfin/mach-bf537/cdefBF534.h b/trunk/include/asm-blackfin/mach-bf537/cdefBF534.h index 7b658c175f85..9a167f3b224e 100644 --- a/trunk/include/asm-blackfin/mach-bf537/cdefBF534.h +++ b/trunk/include/asm-blackfin/mach-bf537/cdefBF534.h @@ -51,12 +51,14 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val) { unsigned long flags, iwr; - bfin_write16(VR_CTL, val); - __builtin_bfin_ssync(); /* Enable the PLL Wakeup bit in SIC IWR */ iwr = bfin_read32(SIC_IWR); /* Only allow PPL Wakeup) */ bfin_write32(SIC_IWR, IWR_ENABLE(0)); + + bfin_write16(VR_CTL, val); + __builtin_bfin_ssync(); + local_irq_save(flags); asm("IDLE;"); local_irq_restore(flags); diff --git a/trunk/include/asm-blackfin/mach-bf561/cdefBF561.h b/trunk/include/asm-blackfin/mach-bf561/cdefBF561.h index 5dc0ed835447..b14f872e5703 100644 --- a/trunk/include/asm-blackfin/mach-bf561/cdefBF561.h +++ b/trunk/include/asm-blackfin/mach-bf561/cdefBF561.h @@ -59,12 +59,14 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val) { unsigned long flags, iwr; - bfin_write16(VR_CTL, val); - __builtin_bfin_ssync(); /* Enable the PLL Wakeup bit in SIC IWR */ iwr = bfin_read32(SICA_IWR0); /* Only allow PPL Wakeup) */ bfin_write32(SICA_IWR0, IWR_ENABLE(0)); + + bfin_write16(VR_CTL, val); + __builtin_bfin_ssync(); + local_irq_save(flags); asm("IDLE;"); local_irq_restore(flags);