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

Commit 9a8f612c authored by Miquel Raynal's avatar Miquel Raynal Committed by Richard Weinberger
Browse files

mtd: rawnand: marvell: Clean the controller state before each operation 



Since the migration of the driver to stop using the legacy
->select_chip() hook, there is nothing deselecting the target anymore,
thus the selection is not forced at the next access. Ensure the ND_RUN
bit and the interrupts are always in a clean state.

Cc: Daniel Mack <daniel@zonque.org>
Cc: stable@vger.kernel.org
Fixes: b2525141 ("mtd: rawnand: marvell: Stop implementing ->select_chip()")
Suggested-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Tested-by: default avatarDaniel Mack <daniel@zonque.org>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 085b7755

drivers/mtd/nand/raw/marvell_nand.c

+6 −6
Original line number Diff line number Diff line
@@ -722,12 +722,6 @@ static void marvell_nfc_select_target(struct nand_chip *chip, 
	struct marvell_nfc *nfc = to_marvell_nfc(chip->controller);

	u32 ndcr_generic;



	if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die)

		return;



	writel_relaxed(marvell_nand->ndtr0, nfc->regs + NDTR0);

	writel_relaxed(marvell_nand->ndtr1, nfc->regs + NDTR1);



	/*

	 * Reset the NDCR register to a clean state for this particular chip,

	 * also clear ND_RUN bit.
@@ -739,6 +733,12 @@ static void marvell_nfc_select_target(struct nand_chip *chip, 
	/* Also reset the interrupt status register */

	marvell_nfc_clear_int(nfc, NDCR_ALL_INT);



	if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die)

		return;



	writel_relaxed(marvell_nand->ndtr0, nfc->regs + NDTR0);

	writel_relaxed(marvell_nand->ndtr1, nfc->regs + NDTR1);



	nfc->selected_chip = chip;

	marvell_nand->selected_die = die_nr;

}