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.
"""

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/mtd/nand/nand_base.c
index b1dd12729f19b29ea8f35886aba02cc986990661,85edac9b2bb549a9544a7a5a5c76068ae1fabfdd..5d865123c38501e9ff8d8c13590ee26c44161f7b
--- 1/drivers/mtd/nand/nand_base.c
--- 2/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];

diff --cc drivers/mtd/nand/tango_nand.c
Simple merge