leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: sh_flctl: Reorder empty_fifo() calls

Browse Source 
Reorders the calls to make it a bit shorter and match the calling
procedure displayed in the datasheet.

Signed-off-by: Bastian Hecht <hechtb@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Bastian Hecht 2012-03-01 10:48:36 +01:00 committed by David Woodhouse
parent b6a5588b27
commit abb59ef3fa
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mtd/nand/sh_flctl.c
View File

@ -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,
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,
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,
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);