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

Commit 0ce82b7f authored by Matthieu CASTET's avatar Matthieu CASTET Committed by David Woodhouse
Browse files

mtd: nand: onfi don't WARN if we are in 16 bits mode 

Commit ff3206b2 ('mtd: nand: onfi need 
to be probed in 8 bits mode') adds a WARN if the onfi probe is in 16 
bits mode. This allows to detect driver that need to be fixed, but this 
is a bit noisy¹. Transform the WARN in a pr_err.

¹ http://article.gmane.org/gmane.linux.ports.arm.omap/91317



Signed-off-by: default avatarMatthieu CASTET <matthieu.castet@parrot.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 7dfe4be3

drivers/mtd/nand/nand_base.c

+5 −2
Original line number Diff line number Diff line
@@ -2857,8 +2857,11 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip, 
	int i;

	int val;



	/* ONFI need to be probed in 8 bits mode */

	WARN_ON(chip->options & NAND_BUSWIDTH_16);

	/* ONFI need to be probed in 8 bits mode, and 16 bits should be selected with NAND_BUSWIDTH_AUTO */

	if (chip->options & NAND_BUSWIDTH_16) {

		pr_err("Trying ONFI probe in 16 bits mode, aborting !\n");

		return 0;

	}

	/* Try ONFI for unknown chip or LP */

	chip->cmdfunc(mtd, NAND_CMD_READID, 0x20, -1);

	if (chip->read_byte(mtd) != 'O' || chip->read_byte(mtd) != 'N' ||