Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mtd/fixes-for-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux
Pull MTD fix from Richard Weinberger:
"A single regression fix for the marvell nand driver"
* tag 'mtd/fixes-for-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
mtd: rawnand: marvell: Clean the controller state before each operation
+6
-6
+6
-6
drivers/mtd/nand/raw/marvell_nand.c
+6
-6
drivers/mtd/nand/raw/marvell_nand.c
···
722
722
struct marvell_nfc *nfc = to_marvell_nfc(chip->controller);
723
723
u32 ndcr_generic;
724
724
725
-
if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die)
726
-
return;
727
-
728
-
writel_relaxed(marvell_nand->ndtr0, nfc->regs + NDTR0);
729
-
writel_relaxed(marvell_nand->ndtr1, nfc->regs + NDTR1);
730
-
731
725
/*
732
726
* Reset the NDCR register to a clean state for this particular chip,
733
727
* also clear ND_RUN bit.
···
732
738
733
739
/* Also reset the interrupt status register */
734
740
marvell_nfc_clear_int(nfc, NDCR_ALL_INT);
741
+
742
+
if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die)
743
+
return;
744
+
745
+
writel_relaxed(marvell_nand->ndtr0, nfc->regs + NDTR0);
746
+
writel_relaxed(marvell_nand->ndtr1, nfc->regs + NDTR1);
735
747
736
748
nfc->selected_chip = chip;
737
749
marvell_nand->selected_die = die_nr;