Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mtd/fixes-for-4.16-rc2' of git://git.infradead.org/linux-mtd
Pull mtd fixes from Boris Brezillon:
- add missing dependency to NAND_MARVELL Kconfig entry
- use the appropriate OOB layout in the VF610 driver
* tag 'mtd/fixes-for-4.16-rc2' of git://git.infradead.org/linux-mtd:
mtd: nand: MTD_NAND_MARVELL should depend on HAS_DMA
mtd: nand: vf610: set correct ooblayout
+3
-5
+1
-1
drivers/mtd/nand/Kconfig
+1
-1
drivers/mtd/nand/Kconfig
···
328
328
tristate "NAND controller support on Marvell boards"
329
329
depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \
330
330
COMPILE_TEST
331
-
depends on HAS_IOMEM
331
+
depends on HAS_IOMEM && HAS_DMA
332
332
help
333
333
This enables the NAND flash controller driver for Marvell boards,
334
334
including:
+2
-4
drivers/mtd/nand/vf610_nfc.c
+2
-4
drivers/mtd/nand/vf610_nfc.c
···
752
752
if (mtd->oobsize > 64)
753
753
mtd->oobsize = 64;
754
754
755
-
/*
756
-
* mtd->ecclayout is not specified here because we're using the
757
-
* default large page ECC layout defined in NAND core.
758
-
*/
755
+
/* Use default large page ECC layout defined in NAND core */
756
+
mtd_set_ooblayout(mtd, &nand_ooblayout_lp_ops);
759
757
if (chip->ecc.strength == 32) {
760
758
nfc->ecc_mode = ECC_60_BYTE;
761
759
chip->ecc.bytes = 60;