Commit b85051e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux 

Pull MTD fixes from Richard Weinberger:

 - Fix a PM regression in brcmnand driver

 - Propagate ECC information correctly on SPI-NAND

 - Make sure no MTD name is used multiple time in nvmem

* tag 'fixes-for-5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  mtd:rawnand: brcmnand: Fix PM resume crash
  mtd: Fix mtd not registered due to nvmem name collision
  mtd: spinand: Propagate ECC information to the MTD structure
parents fea371e2 f3a6a6c5

drivers/mtd/mtdcore.c

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int mtd_nvmem_add(struct mtd_info *mtd) 


	config.id = -1;

	config.dev = &mtd->dev;

	config.name = mtd->name;

	config.name = dev_name(&mtd->dev);

	config.owner = THIS_MODULE;

	config.reg_read = mtd_nvmem_reg_read;

	config.size = mtd->size;

drivers/mtd/nand/raw/brcmnand/brcmnand.c

+1 −2
Original line number Diff line number Diff line
@@ -2728,9 +2728,8 @@ static int brcmnand_resume(struct device *dev) 
		flash_dma_writel(ctrl, FLASH_DMA_ERROR_STATUS, 0);

	}



	if (has_edu(ctrl))

	if (has_edu(ctrl)) {

		ctrl->edu_config = edu_readl(ctrl, EDU_CONFIG);

	else {

		edu_writel(ctrl, EDU_CONFIG, ctrl->edu_config);

		edu_readl(ctrl, EDU_CONFIG);

		brcmnand_edu_init(ctrl);

drivers/mtd/nand/spi/core.c

+4 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,10 @@ static int spinand_init(struct spinand_device *spinand) 


	mtd->oobavail = ret;



	/* Propagate ECC information to mtd_info */

	mtd->ecc_strength = nand->eccreq.strength;

	mtd->ecc_step_size = nand->eccreq.step_size;



	return 0;



err_cleanup_nanddev:

CRA Git | Maintained and supported by SUSTech CRA and CCSE