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

Commit 12efdde3 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by David Woodhouse
Browse files

[MTD] NAND fix cmd_ctrl breakage 



The cmd_ctrl rework lacks some state transition flags.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ace4dfee

drivers/mtd/nand/nand_base.c

+10 −5
Original line number Diff line number Diff line
@@ -538,7 +538,8 @@ static void nand_command(struct mtd_info *mtd, unsigned int command, 
		udelay(chip->chip_delay);

		chip->cmd_ctrl(mtd, NAND_CMD_STATUS,

			       NAND_CTRL_CLE | NAND_CTRL_CHANGE);

		chip->cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE);

		chip->cmd_ctrl(mtd,

			       NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);

		while (!(chip->read_byte(mtd) & NAND_STATUS_READY)) ;

		return;
@@ -641,14 +642,18 @@ static void nand_command_lp(struct mtd_info *mtd, unsigned int command, 
		if (chip->dev_ready)

			break;

		udelay(chip->chip_delay);

		chip->cmd_ctrl(mtd, NAND_CMD_STATUS, NAND_NCE | NAND_CLE);

		chip->cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE);

		chip->cmd_ctrl(mtd, NAND_CMD_STATUS,

			       NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);

		chip->cmd_ctrl(mtd, NAND_CMD_NONE,

			       NAND_NCE | NAND_CTRL_CHANGE);

		while (!(chip->read_byte(mtd) & NAND_STATUS_READY)) ;

		return;



	case NAND_CMD_READ0:

		chip->cmd_ctrl(mtd, NAND_CMD_READSTART, NAND_NCE | NAND_CLE);

		chip->cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE);

		chip->cmd_ctrl(mtd, NAND_CMD_READSTART,

			       NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);

		chip->cmd_ctrl(mtd, NAND_CMD_NONE,

			       NAND_NCE | NAND_CTRL_CHANGE);



		/* This applies to read commands */

	default: