1 files changed, 13 insertions, 16 deletions

diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index bc5c518828d2..77d6c17b38c2 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -41,7 +41,7 @@ static u_char au_read_byte(struct mtd_info *mtd)
 {
         struct nand_chip *this = mtd->priv;
         u_char ret = readb(this->IO_ADDR_R);
-        au_sync();
+        wmb(); /* drain writebuffer */
         return ret;
 }
 
@@ -56,7 +56,7 @@ static void au_write_byte(struct mtd_info *mtd, u_char byte)
 {
         struct nand_chip *this = mtd->priv;
         writeb(byte, this->IO_ADDR_W);
-        au_sync();
+        wmb(); /* drain writebuffer */
 }
 
 /**
@@ -69,7 +69,7 @@ static u_char au_read_byte16(struct mtd_info *mtd)
 {
         struct nand_chip *this = mtd->priv;
         u_char ret = (u_char) cpu_to_le16(readw(this->IO_ADDR_R));
-        au_sync();
+        wmb(); /* drain writebuffer */
         return ret;
 }
 
@@ -84,7 +84,7 @@ static void au_write_byte16(struct mtd_info *mtd, u_char byte)
 {
         struct nand_chip *this = mtd->priv;
         writew(le16_to_cpu((u16) byte), this->IO_ADDR_W);
-        au_sync();
+        wmb(); /* drain writebuffer */
 }
 
 /**
@@ -97,7 +97,7 @@ static u16 au_read_word(struct mtd_info *mtd)
 {
         struct nand_chip *this = mtd->priv;
         u16 ret = readw(this->IO_ADDR_R);
-        au_sync();
+        wmb(); /* drain writebuffer */
         return ret;
 }
 
@@ -116,7 +116,7 @@ static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 
         for (i = 0; i < len; i++) {
                 writeb(buf[i], this->IO_ADDR_W);
-                au_sync();
+                wmb(); /* drain writebuffer */
         }
 }
 
@@ -135,7 +135,7 @@ static void au_read_buf(struct mtd_info *mtd, u_char *buf, int len)
 
         for (i = 0; i < len; i++) {
                 buf[i] = readb(this->IO_ADDR_R);
-                au_sync();
+                wmb(); /* drain writebuffer */
         }
 }
 
@@ -156,7 +156,7 @@ static void au_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)
 
         for (i = 0; i < len; i++) {
                 writew(p[i], this->IO_ADDR_W);
-                au_sync();
+                wmb(); /* drain writebuffer */
         }
 
 }
@@ -178,7 +178,7 @@ static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
 
         for (i = 0; i < len; i++) {
                 p[i] = readw(this->IO_ADDR_R);
-                au_sync();
+                wmb(); /* drain writebuffer */
         }
 }
 
@@ -223,26 +223,23 @@ static void au1550_hwcontrol(struct mtd_info *mtd, int cmd)
 
         case NAND_CTL_SETNCE:
                 /* assert (force assert) chip enable */
-                au_writel((1 << (4 + ctx->cs)), MEM_STNDCTL);
+                alchemy_wrsmem((1 << (4 + ctx->cs)), AU1000_MEM_STNDCTL);
                 break;
 
         case NAND_CTL_CLRNCE:
                 /* deassert chip enable */
-                au_writel(0, MEM_STNDCTL);
+                alchemy_wrsmem(0, AU1000_MEM_STNDCTL);
                 break;
         }
 
         this->IO_ADDR_R = this->IO_ADDR_W;
 
-        /* Drain the writebuffer */
-        au_sync();
+        wmb(); /* Drain the writebuffer */
 }
 
 int au1550_device_ready(struct mtd_info *mtd)
 {
-        int ret = (au_readl(MEM_STSTAT) & 0x1) ? 1 : 0;
-        au_sync();
-        return ret;
+        return (alchemy_rdsmem(AU1000_MEM_STSTAT) & 0x1) ? 1 : 0;
 }
 
 /**