Merge tag 'spi-nor/for-5.7' into mtd/next

SPI NOR core changes:
- move all the manufacturer specific quirks/code out of the core,
to make the core logic more readable and thus ease maintenance.
- move the SFDP logic out of the core, it provides a better
separation between the SFDP parsing and core logic.
- trim what is exposed in spi-nor.h. The SPI NOR controllers drivers
must not be able to use structures that are meant just for the
SPI NOR core.
- use the spi-mem direct mapping API to let advanced controllers
optimize the read/write operations when they support direct mapping.
- add generic formula for the Status Register block protection
handling. It fixes some long standing locking limitations and eases
the addition of the 4bit block protection support.
- add block protection support for flashes with 4 block protection
bits in the Status Register.

SPI NOR controller drivers changes:
- the mtk-quadspi driver is replaced by the new spi-mem
spi-mtk-nor driver. Merge tag 'mtk-mtd-spi-move' into spi-nor/next
to avoid conflicts.

diff --combined MAINTAINERS
index b171bf102a679838218fd9007af5a46ea6b952fe,f5143e248170a769ed466180b4f79d949422364d..bafd4a5652ee85b220159068d1f15486480e0325
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1928,7 -1928,7 +1928,7 @@@ F:      Documentation/devicetree/bindings/i2
  F:    arch/arm/boot/dts/lpc43*
  F:    drivers/i2c/busses/i2c-lpc2k.c
  F:    drivers/memory/pl172.c
- F:    drivers/mtd/spi-nor/nxp-spifi.c
+ F:    drivers/mtd/spi-nor/controllers/nxp-spifi.c
  F:    drivers/rtc/rtc-lpc24xx.c
  N:    lpc18xx
  
@@@ -3649,7 -3649,6 +3649,7 @@@ F:      sound/pci/oxygen
  
  C-SKY ARCHITECTURE
  M:    Guo Ren <guoren@kernel.org>
 +L:    linux-csky@vger.kernel.org
  T:    git https://github.com/c-sky/csky-linux.git
  S:    Supported
  F:    arch/csky/
@@@ -3910,7 -3909,7 +3910,7 @@@ S:      Supporte
  F:    Documentation/filesystems/ceph.txt
  F:    fs/ceph/
  
 -CERTIFICATE HANDLING:
 +CERTIFICATE HANDLING
  M:    David Howells <dhowells@redhat.com>
  M:    David Woodhouse <dwmw2@infradead.org>
  L:    keyrings@vger.kernel.org
@@@ -3920,7 -3919,7 +3920,7 @@@ F:      certs
  F:    scripts/sign-file.c
  F:    scripts/extract-cert.c
  
 -CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 +CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM
  L:    devel@driverdev.osuosl.org
  S:    Obsolete
  F:    drivers/staging/wusbcore/
@@@ -5933,12 -5932,12 +5933,12 @@@ S:   Maintaine
  F:    drivers/media/dvb-frontends/ec100*
  
  ECRYPT FILE SYSTEM
 -M:    Tyler Hicks <tyhicks@canonical.com>
 +M:    Tyler Hicks <code@tyhicks.com>
  L:    ecryptfs@vger.kernel.org
  W:    http://ecryptfs.org
  W:    https://launchpad.net/ecryptfs
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
 -S:    Supported
 +S:    Odd Fixes
  F:    Documentation/filesystems/ecryptfs.txt
  F:    fs/ecryptfs/
  
@@@ -7048,7 -7047,7 +7048,7 @@@ L:      kvm@vger.kernel.or
  S:    Supported
  F:    drivers/uio/uio_pci_generic.c
  
 -GENERIC VDSO LIBRARY:
 +GENERIC VDSO LIBRARY
  M:    Andy Lutomirski <luto@kernel.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
  M:    Vincenzo Frascino <vincenzo.frascino@arm.com>
@@@ -7770,10 -7769,6 +7770,10 @@@ F:    Documentation/ABI/testing/debugfs-hy
  
  HYPERBUS SUPPORT
  M:    Vignesh Raghavendra <vigneshr@ti.com>
 +L:    linux-mtd@lists.infradead.org
 +Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/next
 +C:    irc://irc.oftc.net/mtd
  S:    Supported
  F:    drivers/mtd/hyperbus/
  F:    include/linux/mtd/hyperbus.h
@@@ -8397,7 -8392,7 +8397,7 @@@ M:      Joonas Lahtinen <joonas.lahtinen@lin
  M:    Rodrigo Vivi <rodrigo.vivi@intel.com>
  L:    intel-gfx@lists.freedesktop.org
  W:    https://01.org/linuxgraphics/
 -B:    https://01.org/linuxgraphics/documentation/how-report-bugs
 +B:    https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs
  C:    irc://chat.freenode.net/intel-gfx
  Q:    http://patchwork.freedesktop.org/project/intel-gfx/
  T:    git git://anongit.freedesktop.org/drm-intel
@@@ -9283,7 -9278,7 +9283,7 @@@ F:      include/keys/trusted-type.
  F:    security/keys/trusted.c
  F:    include/keys/trusted.h
  
 -KEYS/KEYRINGS:
 +KEYS/KEYRINGS
  M:    David Howells <dhowells@redhat.com>
  M:    Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
  L:    keyrings@vger.kernel.org
@@@ -11119,12 -11114,14 +11119,12 @@@ S:        Maintaine
  F:    drivers/usb/image/microtek.*
  
  MIPS
 -M:    Ralf Baechle <ralf@linux-mips.org>
 -M:    Paul Burton <paulburton@kernel.org>
 +M:    Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  L:    linux-mips@vger.kernel.org
  W:    http://www.linux-mips.org/
 -T:    git git://git.linux-mips.org/pub/scm/ralf/linux.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
  Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
 -S:    Supported
 +S:    Maintained
  F:    Documentation/devicetree/bindings/mips/
  F:    Documentation/mips/
  F:    arch/mips/
@@@ -11456,7 -11453,6 +11456,7 @@@ L:   linux-mtd@lists.infradead.or
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
 +C:    irc://irc.oftc.net/mtd
  S:    Maintained
  F:    drivers/mtd/nand/
  F:    include/linux/mtd/*nand*.h
@@@ -11488,7 -11484,7 +11488,7 @@@ F:   drivers/scsi/mac_scsi.
  F:    drivers/scsi/sun3_scsi.*
  F:    drivers/scsi/sun3_scsi_vme.c
  
 -NCSI LIBRARY:
 +NCSI LIBRARY
  M:    Samuel Mendoza-Jonas <sam@mendozajonas.com>
  S:    Maintained
  F:    net/ncsi/
@@@ -12744,7 -12740,7 +12744,7 @@@ M:   Tom Joseph <tjoseph@cadence.com
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/cdns,*.txt
 -F:    drivers/pci/controller/pcie-cadence*
 +F:    drivers/pci/controller/cadence/
  
  PCI DRIVER FOR FREESCALE LAYERSCAPE
  M:    Minghuan Lian <minghuan.Lian@nxp.com>
@@@ -13516,7 -13512,7 +13516,7 @@@ L:   linuxppc-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
 -PSAMPLE PACKET SAMPLING SUPPORT:
 +PSAMPLE PACKET SAMPLING SUPPORT
  M:    Yotam Gigi <yotam.gi@gmail.com>
  S:    Maintained
  F:    net/psample
@@@ -14586,10 -14582,10 +14586,10 @@@ F:        drivers/media/pci/saa7146
  F:    include/media/drv-intf/saa7146*
  
  SAFESETID SECURITY MODULE
 -M:     Micah Morton <mortonm@chromium.org>
 -S:     Supported
 -F:     security/safesetid/
 -F:     Documentation/admin-guide/LSM/SafeSetID.rst
 +M:    Micah Morton <mortonm@chromium.org>
 +S:    Supported
 +F:    security/safesetid/
 +F:    Documentation/admin-guide/LSM/SafeSetID.rst
  
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Krzysztof Kozlowski <krzk@kernel.org>
@@@ -15695,7 -15691,6 +15695,7 @@@ L:   linux-mtd@lists.infradead.or
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/next
 +C:    irc://irc.oftc.net/mtd
  S:    Maintained
  F:    drivers/mtd/spi-nor/
  F:    include/linux/mtd/spi-nor.h
@@@ -16557,8 -16552,8 +16557,8 @@@ M:   Michael Jamet <michael.jamet@intel.c
  M:    Mika Westerberg <mika.westerberg@linux.intel.com>
  M:    Yehezkel Bernat <YehezkelShB@gmail.com>
  L:    linux-usb@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git
  F:    Documentation/admin-guide/thunderbolt.rst
  F:    drivers/thunderbolt/
  F:    include/linux/thunderbolt.h
@@@ -17085,7 -17080,7 +17085,7 @@@ S:   Maintaine
  F:    Documentation/admin-guide/ufs.rst
  F:    fs/ufs/
  
 -UHID USERSPACE HID IO DRIVER:
 +UHID USERSPACE HID IO DRIVER
  M:    David Herrmann <dh.herrmann@googlemail.com>
  L:    linux-input@vger.kernel.org
  S:    Maintained
@@@ -17099,18 -17094,18 +17099,18 @@@ S:        Maintaine
  F:    drivers/usb/common/ulpi.c
  F:    include/linux/ulpi/
  
 -ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 +ULTRA-WIDEBAND (UWB) SUBSYSTEM
  L:    devel@driverdev.osuosl.org
  S:    Obsolete
  F:    drivers/staging/uwb/
  
 -UNICODE SUBSYSTEM:
 +UNICODE SUBSYSTEM
  M:    Gabriel Krisman Bertazi <krisman@collabora.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Supported
  F:    fs/unicode/
  
 -UNICORE32 ARCHITECTURE:
 +UNICORE32 ARCHITECTURE
  M:    Guan Xuetao <gxt@pku.edu.cn>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
@@@ -17397,14 -17392,11 +17397,14 @@@ F:        drivers/usb
  F:    include/linux/usb.h
  F:    include/linux/usb/
  
 -USB TYPEC PI3USB30532 MUX DRIVER
 -M:    Hans de Goede <hdegoede@redhat.com>
 +USB TYPEC BUS FOR ALTERNATE MODES
 +M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
 -F:    drivers/usb/typec/mux/pi3usb30532.c
 +F:    Documentation/ABI/testing/sysfs-bus-typec
 +F:    Documentation/driver-api/usb/typec_bus.rst
 +F:    drivers/usb/typec/altmodes/
 +F:    include/linux/usb/typec_altmode.h
  
  USB TYPEC CLASS
  M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
@@@ -17415,11 -17407,14 +17415,11 @@@ F:        Documentation/driver-api/usb/typec.r
  F:    drivers/usb/typec/
  F:    include/linux/usb/typec.h
  
 -USB TYPEC BUS FOR ALTERNATE MODES
 -M:    Heikki Krogerus <heikki.krogerus@linux.intel.com>
 +USB TYPEC PI3USB30532 MUX DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
 -F:    Documentation/ABI/testing/sysfs-bus-typec
 -F:    Documentation/driver-api/usb/typec_bus.rst
 -F:    drivers/usb/typec/altmodes/
 -F:    include/linux/usb/typec_altmode.h
 +F:    drivers/usb/typec/mux/pi3usb30532.c
  
  USB TYPEC PORT CONTROLLER DRIVERS
  M:    Guenter Roeck <linux@roeck-us.net>
@@@ -17796,7 -17791,7 +17796,7 @@@ F:   include/linux/vbox_utils.
  F:    include/uapi/linux/vbox*.h
  F:    drivers/virt/vboxguest/
  
 -VIRTUAL BOX SHARED FOLDER VFS DRIVER:
 +VIRTUAL BOX SHARED FOLDER VFS DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained