Merge tag 'nand/for-4.21' of git://git.infradead.org/linux-mtd into mtd/next

NAND core changes:
- kernel-doc miscellaneous fixes.
- Third batch of fixes/cleanup to the raw NAND core impacting various
  controller drivers (ams-delta, marvell, fsmc, denali, tegra, vf610):
  * Stopping to pass mtd_info objects to internal functions
  * Reorganizing code to avoid forward declarations
  * Dropping useless test in nand_legacy_set_defaults()
  * Moving nand_exec_op() to internal.h
  * Adding nand_[de]select_target() helpers
  * Passing the CS line to be selected in struct nand_operation
  * Making ->select_chip() optional when ->exec_op() is implemented
  * Deprecating the ->select_chip() hook
  * Moving the ->exec_op() method to nand_controller_ops
  * Moving ->setup_data_interface() to nand_controller_ops
  * Deprecating the dummy_controller field
  * Fixing JEDEC detection
  * Providing a helper for polling GPIO R/B pin

Raw NAND chip drivers changes:
- Macronix:
  * Flagging 1.8V AC chips with a broken GET_FEATURES(TIMINGS)

Raw NAND controllers drivers changes:
- Ams-delta:
  * Fixing the error path
  * SPDX tag added
  * May be compiled with COMPILE_TEST=y
  * Conversion to ->exec_op() interface
  * Dropping .IOADDR_R/W use
  * Use GPIO API for data I/O
- Denali:
  * Removing denali_reset_banks()
  * Removing ->dev_ready() hook
  * Including <linux/bits.h> instead of <linux/bitops.h>
  * Changes to comply with the above fixes/cleanup done in the core.
- FSMC:
  * Adding an SPDX tag to replace the license text
  * Making conversion from chip to fsmc consistent
  * Fixing unchecked return value in fsmc_read_page_hwecc
  * Changes to comply with the above fixes/cleanup done in the core.
- Marvell:
  * Preventing timeouts on a loaded machine (fix)
  * Changes to comply with the above fixes/cleanup done in the core.
- OMAP2:
  * Pass the parent of pdev to dma_request_chan() (fix)
- R852:
  * Use generic DMA API
- sh_flctl:
  * Converting to SPDX identifiers
- Sunxi:
  * Write pageprog related opcodes to the right register: WCMD_SET (fix)
- Tegra:
  * Stop implementing ->select_chip()
- VF610:
  * Adding an SPDX tag to replace the license text
  * Changes to comply with the above fixes/cleanup done in the core.
- Various trivial/spelling/coding style fixes.

SPI-NAND drivers changes:
- Removing the depreacated mt29f_spinand driver from staging.
- Adding support for:
  * Toshiba TC58CVG2S0H
  * GigaDevice GD5FxGQ4xA
  * Winbond W25N01GV

diff --combined .mailmap
index a95c436,28fecaf..b4b0b0b
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -36,10 -36,9 +36,10 @@@ Bart Van Assche <bvanassche@acm.org> <b
  Ben Gardner <bgardner@wabtec.com>
  Ben M Cahill <ben.m.cahill@intel.com>
  Björn Steinbrink <B.Steinbrink@gmx.de>
 -Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@free-electrons.com>
 -Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon.dev@gmail.com>
 -Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon@overkiz.com>
 +Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
 +Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
 +Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>
 +Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>
  Brian Avery <b.avery@hp.com>
  Brian King <brking@us.ibm.com>
  Christoph Hellwig <hch@lst.de>
@@@ -160,6 -159,7 +160,7 @@@ Peter Oruba <peter@oruba.de
  Peter Oruba <peter.oruba@amd.com>
  Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
  Praveen BP <praveenbp@ti.com>
+ Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
  Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
  Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
  Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

diff --combined MAINTAINERS
index db91537,0abecc5..a22b0c2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4821,7 -4821,7 +4821,7 @@@ F:      Documentation/gpu/meson.rs
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
  DRM DRIVERS FOR ATMEL HLCDC
 -M:    Boris Brezillon <boris.brezillon@bootlin.com>
 +M:    Boris Brezillon <bbrezillon@kernel.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  F:    drivers/gpu/drm/atmel-hlcdc/
@@@ -6607,9 -6607,9 +6607,9 @@@ F:      arch/*/include/asm/suspend*.
  
  HID CORE LAYER
  M:    Jiri Kosina <jikos@kernel.org>
- R:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
+ M:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
  L:    linux-input@vger.kernel.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  S:    Maintained
  F:    drivers/hid/
  F:    include/linux/hid*
@@@ -6861,6 -6861,13 +6861,13 @@@ L:    linux-acpi@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/i2c-core-acpi.c
  
+ I2C CONTROLLER DRIVER FOR NVIDIA GPU
+ M:    Ajay Gupta <ajayg@nvidia.com>
+ L:    linux-i2c@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/i2c/busses/i2c-nvidia-gpu
+ F:    drivers/i2c/busses/i2c-nvidia-gpu.c
+ 
  I2C MUXES
  M:    Peter Rosin <peda@axentia.se>
  L:    linux-i2c@vger.kernel.org
@@@ -8367,7 -8374,7 +8374,7 @@@ F:      drivers/media/dvb-frontends/lgdt3305
  LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
  M:    Viresh Kumar <vireshk@kernel.org>
  L:    linux-ide@vger.kernel.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    include/linux/pata_arasan_cf_data.h
  F:    drivers/ata/pata_arasan_cf.c
@@@ -8384,7 -8391,7 +8391,7 @@@ F:      drivers/ata/ata_generic.
  LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-ide@vger.kernel.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    drivers/ata/pata_ftide010.c
  F:    drivers/ata/sata_gemini.c
@@@ -8403,7 -8410,7 +8410,7 @@@ F:      include/linux/ahci_platform.
  LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
  M:    Mikael Pettersson <mikpelinux@gmail.com>
  L:    linux-ide@vger.kernel.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    drivers/ata/sata_promise.*
  
@@@ -8865,7 -8872,7 +8872,7 @@@ F:      include/uapi/drm/armada_drm.
  F:    Documentation/devicetree/bindings/display/armada/
  
  MARVELL CRYPTO DRIVER
 -M:    Boris Brezillon <boris.brezillon@bootlin.com>
 +M:    Boris Brezillon <bbrezillon@kernel.org>
  M:    Arnaud Ebalard <arno@natisbad.org>
  F:    drivers/crypto/marvell/
  S:    Maintained
@@@ -9569,7 -9576,7 +9576,7 @@@ F:      mm
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <dwmw2@infradead.org>
  M:    Brian Norris <computersforpeace@gmail.com>
 -M:    Boris Brezillon <boris.brezillon@bootlin.com>
 +M:    Boris Brezillon <bbrezillon@kernel.org>
  M:    Marek Vasut <marek.vasut@gmail.com>
  M:    Richard Weinberger <richard@nod.at>
  L:    linux-mtd@lists.infradead.org
@@@ -10159,7 -10166,7 +10166,7 @@@ S:   Supporte
  F:    drivers/net/ethernet/myricom/myri10ge/
  
  NAND FLASH SUBSYSTEM
 -M:    Boris Brezillon <boris.brezillon@bootlin.com>
 +M:    Boris Brezillon <bbrezillon@kernel.org>
  M:    Miquel Raynal <miquel.raynal@bootlin.com>
  R:    Richard Weinberger <richard@nod.at>
  L:    linux-mtd@lists.infradead.org
@@@ -10784,6 -10791,14 +10791,14 @@@ L: linux-omap@vger.kernel.or
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod.*
  
+ OMAP I2C DRIVER
+ M:    Vignesh R <vigneshr@ti.com>
+ L:    linux-omap@vger.kernel.org
+ L:    linux-i2c@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/i2c/i2c-omap.txt
+ F:    drivers/i2c/busses/i2c-omap.c
+ 
  OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -15436,9 -15451,9 +15451,9 @@@ F:   include/linux/usb/gadget
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
  M:    Jiri Kosina <jikos@kernel.org>
- R:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
+ M:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
  L:    linux-usb@vger.kernel.org
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  S:    Maintained
  F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/

diff --combined drivers/mtd/nand/raw/nandsim.c
index ef87214,2b3047d..933d1a6
--- 1/drivers/mtd/nand/raw/nandsim.c
--- 2/drivers/mtd/nand/raw/nandsim.c
+++ b/drivers/mtd/nand/raw/nandsim.c
@@@ -443,7 -443,7 +443,7 @@@ static unsigned long total_wear = 0
  /* MTD structure for NAND controller */
  static struct mtd_info *nsmtd;
  
 -static int nandsim_debugfs_show(struct seq_file *m, void *private)
 +static int nandsim_show(struct seq_file *m, void *private)
  {
        unsigned long wmin = -1, wmax = 0, avg;
        unsigned long deciles[10], decile_max[10], tot = 0;
@@@ -494,7 -494,18 +494,7 @@@
  
        return 0;
  }
 -
 -static int nandsim_debugfs_open(struct inode *inode, struct file *file)
 -{
 -      return single_open(file, nandsim_debugfs_show, inode->i_private);
 -}
 -
 -static const struct file_operations dfs_fops = {
 -      .open           = nandsim_debugfs_open,
 -      .read           = seq_read,
 -      .llseek         = seq_lseek,
 -      .release        = single_release,
 -};
 +DEFINE_SHOW_ATTRIBUTE(nandsim);
  
  /**
   * nandsim_debugfs_create - initialize debugfs
@@@ -520,7 -531,7 +520,7 @@@ static int nandsim_debugfs_create(struc
        }
  
        dent = debugfs_create_file("nandsim_wear_report", S_IRUSR,
 -                                 root, dev, &dfs_fops);
 +                                 root, dev, &nandsim_fops);
        if (IS_ERR_OR_NULL(dent)) {
                NS_ERR("cannot create \"nandsim_wear_report\" debugfs entry\n");
                return -1;
@@@ -2293,7 -2304,7 +2293,7 @@@ static int __init ns_init_module(void
        if ((retval = parse_gravepages()) != 0)
                goto error;
  
-       chip->dummy_controller.ops = &ns_controller_ops;
+       chip->legacy.dummy_controller.ops = &ns_controller_ops;
        retval = nand_scan(chip, 1);
        if (retval) {
                NS_ERR("Could not scan NAND Simulator device\n");