|
@@ -291,14 +291,13 @@ static void omap_write_buf8(struct mtd_info *mtd, const u_char *buf, int len)
|
|
{
|
|
{
|
|
struct omap_nand_info *info = mtd_to_omap(mtd);
|
|
struct omap_nand_info *info = mtd_to_omap(mtd);
|
|
u_char *p = (u_char *)buf;
|
|
u_char *p = (u_char *)buf;
|
|
- u32 status = 0;
|
|
|
|
|
|
+ bool status;
|
|
|
|
|
|
while (len--) {
|
|
while (len--) {
|
|
iowrite8(*p++, info->nand.IO_ADDR_W);
|
|
iowrite8(*p++, info->nand.IO_ADDR_W);
|
|
/* wait until buffer is available for write */
|
|
/* wait until buffer is available for write */
|
|
do {
|
|
do {
|
|
- status = readl(info->reg.gpmc_status) &
|
|
|
|
- STATUS_BUFF_EMPTY;
|
|
|
|
|
|
+ status = info->ops->nand_writebuffer_empty();
|
|
} while (!status);
|
|
} while (!status);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -326,7 +325,7 @@ static void omap_write_buf16(struct mtd_info *mtd, const u_char * buf, int len)
|
|
{
|
|
{
|
|
struct omap_nand_info *info = mtd_to_omap(mtd);
|
|
struct omap_nand_info *info = mtd_to_omap(mtd);
|
|
u16 *p = (u16 *) buf;
|
|
u16 *p = (u16 *) buf;
|
|
- u32 status = 0;
|
|
|
|
|
|
+ bool status;
|
|
/* FIXME try bursts of writesw() or DMA ... */
|
|
/* FIXME try bursts of writesw() or DMA ... */
|
|
len >>= 1;
|
|
len >>= 1;
|
|
|
|
|
|
@@ -334,8 +333,7 @@ static void omap_write_buf16(struct mtd_info *mtd, const u_char * buf, int len)
|
|
iowrite16(*p++, info->nand.IO_ADDR_W);
|
|
iowrite16(*p++, info->nand.IO_ADDR_W);
|
|
/* wait until buffer is available for write */
|
|
/* wait until buffer is available for write */
|
|
do {
|
|
do {
|
|
- status = readl(info->reg.gpmc_status) &
|
|
|
|
- STATUS_BUFF_EMPTY;
|
|
|
|
|
|
+ status = info->ops->nand_writebuffer_empty();
|
|
} while (!status);
|
|
} while (!status);
|
|
}
|
|
}
|
|
}
|
|
}
|