From 9a4d17fe7cedf2cbf6f0c0f3cbcee8b9443a3309 Mon Sep 17 00:00:00 2001
From: nifi <nifi>
Date: Tue, 12 Oct 2010 22:55:11 +0000
Subject: [PATCH] Bug fix: put device in standby mode at startup in case it has
 previously been put in deep power-down mode; patch by Martin Bor

---
 platform/sky/dev/xmem.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/platform/sky/dev/xmem.c b/platform/sky/dev/xmem.c
index 1b892a376..d935bcfb4 100644
--- a/platform/sky/dev/xmem.c
+++ b/platform/sky/dev/xmem.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: xmem.c,v 1.11 2010/06/23 10:18:05 joxe Exp $
+ * @(#)$Id: xmem.c,v 1.12 2010/10/12 22:55:11 nifi Exp $
  */
 
 /**
@@ -147,12 +147,20 @@ erase_sector(unsigned long offset)
 void
 xmem_init(void)
 {
+  int s;
   spi_init();
 
   P4DIR |= BV(FLASH_CS) | BV(FLASH_HOLD) | BV(FLASH_PWR);
   P4OUT |= BV(FLASH_PWR);       /* P4.3 Output, turn on power! */
 
+  /* Release from Deep Power-down */
+  s = splhigh();
+  SPI_FLASH_ENABLE();
+  SPI_WRITE_FAST(SPI_FLASH_INS_RES);
+  SPI_WAITFORTx_ENDED();
   SPI_FLASH_DISABLE();		/* Unselect flash. */
+  splx(s);
+
   SPI_FLASH_UNHOLD();
 }
 /*---------------------------------------------------------------------------*/