Commit abb59ef3 authored by Bastian Hecht's avatar Bastian Hecht Committed by David Woodhouse

mtd: sh_flctl: Reorder empty_fifo() calls

Reorders the calls to make it a bit shorter and match the calling
procedure displayed in the datasheet.
Signed-off-by: default avatarBastian Hecht <hechtb@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent b6a5588b
...@@ -525,7 +525,6 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command, ...@@ -525,7 +525,6 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command,
execmd_read_page_sector(mtd, page_addr); execmd_read_page_sector(mtd, page_addr);
break; break;
} }
empty_fifo(flctl);
if (flctl->page_size) if (flctl->page_size)
set_cmd_regs(mtd, command, (NAND_CMD_READSTART << 8) set_cmd_regs(mtd, command, (NAND_CMD_READSTART << 8)
| command); | command);
...@@ -547,7 +546,6 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command, ...@@ -547,7 +546,6 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command,
break; break;
} }
empty_fifo(flctl);
if (flctl->page_size) { if (flctl->page_size) {
set_cmd_regs(mtd, command, (NAND_CMD_READSTART << 8) set_cmd_regs(mtd, command, (NAND_CMD_READSTART << 8)
| NAND_CMD_READ0); | NAND_CMD_READ0);
...@@ -560,12 +558,12 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command, ...@@ -560,12 +558,12 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command,
goto read_normal_exit; goto read_normal_exit;
case NAND_CMD_READID: case NAND_CMD_READID:
empty_fifo(flctl);
set_cmd_regs(mtd, command, command); set_cmd_regs(mtd, command, command);
set_addr(mtd, 0, 0); set_addr(mtd, 0, 0);
flctl->read_bytes = 4; flctl->read_bytes = 4;
writel(flctl->read_bytes, FLDTCNTR(flctl)); /* set read size */ writel(flctl->read_bytes, FLDTCNTR(flctl)); /* set read size */
empty_fifo(flctl);
start_translation(flctl); start_translation(flctl);
read_datareg(flctl, 0); /* read and end */ read_datareg(flctl, 0); /* read and end */
break; break;
...@@ -654,6 +652,7 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command, ...@@ -654,6 +652,7 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command,
read_normal_exit: read_normal_exit:
writel(flctl->read_bytes, FLDTCNTR(flctl)); /* set read size */ writel(flctl->read_bytes, FLDTCNTR(flctl)); /* set read size */
empty_fifo(flctl);
start_translation(flctl); start_translation(flctl);
read_fiforeg(flctl, flctl->read_bytes, 0); read_fiforeg(flctl, flctl->read_bytes, 0);
wait_completion(flctl); wait_completion(flctl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment