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

Commit 4b6415f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ee78ad78 f23def80

drivers/mtd/nand/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ config MTD_NAND_MARVELL 
	tristate "NAND controller support on Marvell boards"

	depends on PXA3xx || ARCH_MMP || PLAT_ORION || ARCH_MVEBU || \

		   COMPILE_TEST

	depends on HAS_IOMEM

	depends on HAS_IOMEM && HAS_DMA

	help

	  This enables the NAND flash controller driver for Marvell boards,

	  including:

drivers/mtd/nand/vf610_nfc.c

+2 −4
Original line number Diff line number Diff line
@@ -752,10 +752,8 @@ static int vf610_nfc_probe(struct platform_device *pdev) 
		if (mtd->oobsize > 64)

			mtd->oobsize = 64;



		/*

		 * mtd->ecclayout is not specified here because we're using the

		 * default large page ECC layout defined in NAND core.

		 */

		/* Use default large page ECC layout defined in NAND core */

		mtd_set_ooblayout(mtd, &nand_ooblayout_lp_ops);

		if (chip->ecc.strength == 32) {

			nfc->ecc_mode = ECC_60_BYTE;

			chip->ecc.bytes = 60;