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

SPI NOR core changes:
- Ability to dump SFDP tables via sysfs
- Support for erasing OTP regions on Winbond and similar flashes
- Few API doc updates and fixes
- Locking support for MX25L12805D

SPI NOR controller drivers changes:
- Use SPI_MODE_X_MASK in nxp-spifi
- Intel Alder Lake-M SPI serial flash support

diff --combined MAINTAINERS
index aeb8b40b6b74aecde990ba03a1da4199efb176ca,81e1edeceae40d670f7dea098efff1a959aeeadb..cfcaa70d2c68795072b1ad445022f92634f694d0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1311,7 -1311,6 +1311,7 @@@ W:      http://www.aquantia.co
  F:    drivers/net/ethernet/aquantia/atlantic/aq_ptp*
  
  ARASAN NAND CONTROLLER DRIVER
 +M:    Miquel Raynal <[email protected]>
  M:    Naga Sureshkumar Relli <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -1453,22 -1452,6 +1453,22 @@@ S:    Odd Fixe
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
 +ARM PRIMECELL PL35X NAND CONTROLLER DRIVER
 +M:    Miquel Raynal <[email protected]@bootlin.com>
 +M:    Naga Sureshkumar Relli <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mtd/arm,pl353-nand-r2p1.yaml
 +F:    drivers/mtd/nand/raw/pl35x-nand-controller.c
 +
 +ARM PRIMECELL PL35X SMC DRIVER
 +M:    Miquel Raynal <[email protected]@bootlin.com>
 +M:    Naga Sureshkumar Relli <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mtd/arm,pl353-smc.yaml
 +F:    drivers/memory/pl353-smc.c
 +
  ARM PRIMECELL CLCD PL110 DRIVER
  M:    Russell King <[email protected]>
  S:    Odd Fixes
@@@ -1595,7 -1578,7 +1595,7 @@@ F:      drivers/clk/sunxi
  ARM/Allwinner sunXi SoC support
  M:    Maxime Ripard <[email protected]>
  M:    Chen-Yu Tsai <[email protected]>
- R:    Jernej Skrabec <jernej.skrabec@siol.net>
+ R:    Jernej Skrabec <jernej.skrabec@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
@@@ -1635,8 -1618,8 +1635,8 @@@ F:      Documentation/devicetree/bindings/so
  F:    sound/soc/meson/
  
  ARM/Amlogic Meson SoC support
+ M:    Neil Armstrong <[email protected]>
  M:    Kevin Hilman <[email protected]>
- R:    Neil Armstrong <[email protected]>
  R:    Jerome Brunet <[email protected]>
  R:    Martin Blumenstingl <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -5106,7 -5089,7 +5106,7 @@@ S:      Maintaine
  F:    drivers/net/fddi/defza.*
  
  DEINTERLACE DRIVERS FOR ALLWINNER H3
- M:    Jernej Skrabec <jernej.skrabec@siol.net>
+ M:    Jernej Skrabec <jernej.skrabec@gmail.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -5254,7 -5237,7 +5254,7 @@@ DEVICE DIRECT ACCESS (DAX
  M:    Dan Williams <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
- L:    [email protected]
+ L:    [email protected]
  S:    Supported
  F:    drivers/dax/
  
@@@ -5649,14 -5632,14 +5649,14 @@@ F:   include/linux/power/smartreflex.
  DRM DRIVER FOR ALLWINNER DE2 AND DE3 ENGINE
  M:    Maxime Ripard <[email protected]>
  M:    Chen-Yu Tsai <[email protected]>
- R:    Jernej Skrabec <jernej.skrabec@siol.net>
+ R:    Jernej Skrabec <jernej.skrabec@gmail.com>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/sun4i/sun8i*
  
  DRM DRIVER FOR ARM PL111 CLCD
- M:    Eric Anholt <eric@anholt.net>
+ M:    Emma Anholt <emma@anholt.net>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/pl111/
@@@ -5736,7 -5719,7 +5736,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/tiny/gm12u320.c
  
  DRM DRIVER FOR HX8357D PANELS
- M:    Eric Anholt <eric@anholt.net>
+ M:    Emma Anholt <emma@anholt.net>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/himax,hx8357d.txt
@@@ -6040,7 -6023,7 +6040,7 @@@ M:      Neil Armstrong <narmstrong@baylibre.
  M:    Robert Foss <[email protected]>
  R:    Laurent Pinchart <[email protected]>
  R:    Jonas Karlman <[email protected]>
- R:    Jernej Skrabec <jernej.skrabec@siol.net>
+ R:    Jernej Skrabec <jernej.skrabec@gmail.com>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/bridge/
@@@ -6194,7 -6177,7 +6194,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/omapdrm/
  
  DRM DRIVERS FOR V3D
- M:    Eric Anholt <eric@anholt.net>
+ M:    Emma Anholt <emma@anholt.net>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
@@@ -6202,7 -6185,7 +6202,7 @@@ F:      drivers/gpu/drm/v3d
  F:    include/uapi/drm/v3d_drm.h
  
  DRM DRIVERS FOR VC4
- M:    Eric Anholt <eric@anholt.net>
+ M:    Emma Anholt <emma@anholt.net>
  M:    Maxime Ripard <[email protected]>
  S:    Supported
  T:    git git://github.com/anholt/linux
@@@ -7023,7 -7006,7 +7023,7 @@@ M:      Dan Williams <[email protected]
  R:    Matthew Wilcox <[email protected]>
  R:    Jan Kara <[email protected]>
  L:    [email protected]
- L:    [email protected]
+ L:    [email protected]
  S:    Supported
  F:    fs/dax.c
  F:    include/linux/dax.h
@@@ -10395,7 -10378,7 +10395,7 @@@ LIBNVDIMM BLK: MMIO-APERTURE DRIVE
  M:    Dan Williams <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
- L:    [email protected]
+ L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  P:    Documentation/nvdimm/maintainer-entry-profile.rst
@@@ -10406,7 -10389,7 +10406,7 @@@ LIBNVDIMM BTT: BLOCK TRANSLATION TABL
  M:    Vishal Verma <[email protected]>
  M:    Dan Williams <[email protected]>
  M:    Dave Jiang <[email protected]>
- L:    [email protected]
+ L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  P:    Documentation/nvdimm/maintainer-entry-profile.rst
@@@ -10416,7 -10399,7 +10416,7 @@@ LIBNVDIMM PMEM: PERSISTENT MEMORY DRIVE
  M:    Dan Williams <[email protected]>
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
- L:    [email protected]
+ L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  P:    Documentation/nvdimm/maintainer-entry-profile.rst
@@@ -10424,7 -10407,7 +10424,7 @@@ F:   drivers/nvdimm/pmem
  
  LIBNVDIMM: DEVICETREE BINDINGS
  M:    Oliver O'Halloran <[email protected]>
- L:    [email protected]
+ L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  F:    Documentation/devicetree/bindings/pmem/pmem-region.txt
@@@ -10435,7 -10418,7 +10435,7 @@@ M:   Dan Williams <[email protected]
  M:    Vishal Verma <[email protected]>
  M:    Dave Jiang <[email protected]>
  M:    Ira Weiny <[email protected]>
- L:    [email protected]
+ L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
  P:    Documentation/nvdimm/maintainer-entry-profile.rst
@@@ -12197,6 -12180,7 +12197,7 @@@ F:   drivers/platform/surface/surfacepro3
  
  MICROSOFT SURFACE SYSTEM AGGREGATOR SUBSYSTEM
  M:    Maximilian Luz <[email protected]>
+ L:    [email protected]
  S:    Maintained
  W:    https://github.com/linux-surface/surface-aggregator-module
  C:    irc://chat.freenode.net/##linux-surface
@@@ -14751,7 -14735,6 +14752,6 @@@ W:   https://wireless.wiki.kernel.org/en/
  F:    drivers/net/wireless/intersil/prism54/
  
  PROC FILESYSTEM
- R:    Alexey Dobriyan <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -15832,7 -15815,7 +15832,7 @@@ F:   include/uapi/linux/rose.
  F:    net/rose/
  
  ROTATION DRIVER FOR ALLWINNER A83T
- M:    Jernej Skrabec <jernej.skrabec@siol.net>
+ M:    Jernej Skrabec <jernej.skrabec@gmail.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git