From: Brian Norris <computersforpeace@gmail.com>
Date: Sat, 8 Jul 2017 01:03:11 +0000 (-0700)
Subject: Merge tag 'nand/for-4.13' into MTD
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ef32476f268c321c101d3e09e05c7fd9a77177cb;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'nand/for-4.13' into MTD

From Boris:
"""
This pull request contains the following core changes:

* addition of on-ecc support to Micron driver
* addition of helpers to help drivers choose most appropriate ECC
  settings
* deletion of dead-code (cached programming and ->errstat() hook)
* make sure drivers that do not support the SET/GET FEATURES command
  return ENOTSUPP use a dummy ->set/get_features implementation
  returning -ENOTSUPP (required for Micron on-die ECC)
* change the semantic of ecc->write_page() for drivers setting the
  NAND_ECC_CUSTOM_PAGE_ACCESS flag
* support exiting 'GET STATUS' command in default ->cmdfunc()
  implementations
* change the prototype of ->setup_data_interface()

A bunch of driver related changes:

* various cleanup, fixes and improvements of the MTK driver
* OMAP DT bindings fixes
* support for ->setup_data_interface() in the fsmc driver
* support for imx7 in the gpmi driver
* finalization of the denali driver rework (thanks to Masahiro for the
  work he's done on this driver)
* fix "bitflips in erased pages" handling in the ifc driver
* addition of PM ops and dynamic timing configuration to the atmel
  driver

And as usual we also have a few minor cleanup/fixes/improvements
patches across the subsystem.
"""
---

ef32476f268c321c101d3e09e05c7fd9a77177cb
diff --cc drivers/mtd/nand/nand_base.c
index b1dd12729f19,85edac9b2bb5..5d865123c385
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@@ -4371,9 -4391,9 +4391,9 @@@ int nand_scan_ident(struct mtd_info *mt
  	 * For the other dies, nand_reset() will automatically switch to the
  	 * best mode for us.
  	 */
- 	ret = nand_setup_data_interface(chip);
+ 	ret = nand_setup_data_interface(chip, 0);
  	if (ret)
 -		return ret;
 +		goto err_nand_init;
  
  	nand_maf_id = chip->id.data[0];
  	nand_dev_id = chip->id.data[1];