Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/mtd/nand/sh_flctl.c

+2 −3
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command, 
			execmd_read_page_sector(mtd, page_addr);

			break;

		}

		empty_fifo(flctl);

		if (flctl->page_size)

			set_cmd_regs(mtd, command, (NAND_CMD_READSTART << 8)

				| command);
@@ -547,7 +546,6 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command, 
			break;

		}



		empty_fifo(flctl);

		if (flctl->page_size) {

			set_cmd_regs(mtd, command, (NAND_CMD_READSTART << 8)

				| NAND_CMD_READ0);
@@ -560,12 +558,12 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command, 
		goto read_normal_exit;



	case NAND_CMD_READID:

		empty_fifo(flctl);

		set_cmd_regs(mtd, command, command);

		set_addr(mtd, 0, 0);



		flctl->read_bytes = 4;

		writel(flctl->read_bytes, FLDTCNTR(flctl)); /* set read size */

		empty_fifo(flctl);

		start_translation(flctl);

		read_datareg(flctl, 0);	/* read and end */

		break;
@@ -654,6 +652,7 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command, 


read_normal_exit:

	writel(flctl->read_bytes, FLDTCNTR(flctl));	/* set read size */

	empty_fifo(flctl);

	start_translation(flctl);

	read_fiforeg(flctl, flctl->read_bytes, 0);

	wait_completion(flctl);