Merge tag 'omap-for-v5.12/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel...

SoC changes for omaps for v5.12 merge window

Update email address for Roger and fix a typo

* tag 'omap-for-v5.12/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: fix spellint typo
  MAINTAINERS: Update address for OMAP GPMC driver

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>

diff --combined MAINTAINERS
index cc1e6a5ee6e67357822317c7f71ea9171bdcefcb,c36652aef387031e3a15a822e1f06988924b9257..d9e8cef48552b21f8478bb69d23a905347d92d8d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -203,8 -203,8 +203,8 @@@ F: include/uapi/linux/nl80211.
  F:    net/wireless/
  
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
 -M:    Realtek linux nic maintainers <[email protected]>
  M:    Heiner Kallweit <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/realtek/r8169*
@@@ -2119,7 -2119,7 +2119,7 @@@ N:      atme
  ARM/Microchip Sparx5 SoC support
  M:    Lars Povlsen <[email protected]>
  M:    Steen Hegelund <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  T:    git git://github.com/microchip-ung/linux-upstream.git
@@@ -3556,7 -3556,7 +3556,7 @@@ S:      Supporte
  F:    drivers/net/ethernet/broadcom/bnxt/
  
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 -M:    Arend van Spriel <arend.vanspriel@broadcom.com>
 +M:    Arend van Spriel <aspriel@gmail.com>
  M:    Franky Lin <[email protected]>
  M:    Hante Meuleman <[email protected]>
  M:    Chi-hsien Lin <[email protected]>
@@@ -3883,7 -3883,7 +3883,7 @@@ F:      drivers/mtd/nand/raw/cadence-nand-co
  CADENCE USB3 DRD IP DRIVER
  M:    Peter Chen <[email protected]>
  M:    Pawel Laszczak <[email protected]>
 -M:    Roger Quadros <[email protected]>
 +R:    Roger Quadros <[email protected]>
  R:    Aswath Govindraju <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -3961,7 -3961,7 +3961,7 @@@ F:      net/can
  CAN-J1939 NETWORK LAYER
  M:    Robin van der Gracht <[email protected]>
  M:    Oleksij Rempel <[email protected]>
 -R:    Pengutronix Kernel Team <[email protected]>
 +R:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/j1939.rst
@@@ -4588,7 -4588,7 +4588,7 @@@ B:      https://bugzilla.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  F:    Documentation/admin-guide/pm/cpuidle.rst
  F:    Documentation/driver-api/pm/cpuidle.rst
 -F:    drivers/cpuidle/*
 +F:    drivers/cpuidle/
  F:    include/linux/cpuidle.h
  
  CPU POWER MONITORING SUBSYSTEM
@@@ -7363,6 -7363,7 +7363,6 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/kbuild/gcc-plugins.rst
  F:    scripts/Makefile.gcc-plugins
 -F:    scripts/gcc-plugin.sh
  F:    scripts/gcc-plugins/
  
  GCOV BASED KERNEL PROFILING
@@@ -9239,7 -9240,7 +9239,7 @@@ F:      tools/testing/selftests/sgx/
  K:    \bSGX_
  
  INTERCONNECT API
 -M:    Georgi Djakov <georgi.djakov@linaro.org>
 +M:    Georgi Djakov <djakov@kernel.org>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/interconnect/
@@@ -9272,7 -9273,7 +9272,7 @@@ F:      drivers/net/ethernet/sgi/ioc3-eth.
  
  IOMAP FILESYSTEM LIBRARY
  M:    Christoph Hellwig <[email protected]>
 -M:    Darrick J. Wong <d[email protected]>
 +M:    Darrick J. Wong <d[email protected]>
  M:    [email protected]
  M:    [email protected]
  L:    [email protected]
@@@ -9775,7 -9776,7 +9775,7 @@@ F:      tools/testing/selftests/kvm/s390x
  
  KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)
  M:    Paolo Bonzini <[email protected]>
 -R:    Sean Christopherson <sean.j.christopherson@intel.com>
 +R:    Sean Christopherson <seanjc@google.com>
  R:    Vitaly Kuznetsov <[email protected]>
  R:    Wanpeng Li <[email protected]>
  R:    Jim Mattson <[email protected]>
@@@ -10259,6 -10260,7 +10259,6 @@@ S:   Supporte
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
  F:    Documentation/atomic_bitops.txt
  F:    Documentation/atomic_t.txt
 -F:    Documentation/core-api/atomic_ops.rst
  F:    Documentation/core-api/refcount-vs-atomic.rst
  F:    Documentation/litmus-tests/
  F:    Documentation/memory-barriers.txt
@@@ -10845,7 -10847,7 +10845,7 @@@ F:   drivers/media/radio/radio-maxiradio
  
  MCAN MMIO DEVICE DRIVER
  M:    Dan Murphy <[email protected]>
 -M:    Sriram Dash <sriram.dash@samsung.com>
 +M:    Pankaj Sharma <pankj.sharma@samsung.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
@@@ -11665,7 -11667,7 +11665,7 @@@ F:   drivers/media/platform/atmel/atmel-i
  
  MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
  M:    Woojung Huh <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
@@@ -11675,7 -11677,7 +11675,7 @@@ F:   net/dsa/tag_ksz.
  
  MICROCHIP LAN743X ETHERNET DRIVER
  M:    Bryan Whitehead <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/microchip/lan743x_*
@@@ -11769,7 -11771,7 +11769,7 @@@ F:   drivers/net/wireless/microchip/wilc1
  
  MICROSEMI MIPS SOCS
  M:    Alexandre Belloni <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/devicetree/bindings/mips/mscc.txt
@@@ -12823,10 -12825,10 +12823,10 @@@ F:        tools/objtool
  F:    include/linux/objtool.h
  
  OCELOT ETHERNET SWITCH DRIVER
 -M:    Microchip Linux Driver Support <[email protected]>
  M:    Vladimir Oltean <[email protected]>
  M:    Claudiu Manoil <[email protected]>
  M:    Alexandre Belloni <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/dsa/ocelot/*
@@@ -12892,7 -12894,7 +12892,7 @@@ S:   Orpha
  F:    drivers/video/fbdev/omap/
  
  OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
- M:    Roger Quadros <rogerq@ti.com>
+ M:    Roger Quadros <rogerq@kernel.org>
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -13888,7 -13890,7 +13888,7 @@@ F:   drivers/platform/x86/peaq-wmi.
  
  PENSANDO ETHERNET DRIVERS
  M:    Shannon Nelson <[email protected]>
 -M:    Pensando Drivers <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
@@@ -14667,7 -14669,7 +14667,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/net/wireless/ath/ath11k/
  
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
 -M:    QCA ath9k Development <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
@@@ -16708,8 -16710,6 +16708,8 @@@ M:   Samuel Thibault <samuel.thibault@ens
  L:    [email protected]
  S:    Odd Fixes
  W:    http://www.linux-speakup.org/
 +W:    https://github.com/linux-speakup/speakup
 +B:    https://github.com/linux-speakup/speakup/issues
  F:    drivers/accessibility/speakup/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
@@@ -17553,19 -17553,6 +17553,19 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/iio/dac/ti,dac7612.txt
  F:    drivers/iio/dac/ti-dac7612.c
  
 +TEXAS INSTRUMENTS DMA DRIVERS
 +M:    Peter Ujfalusi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
 +F:    Documentation/devicetree/bindings/dma/ti-edma.txt
 +F:    Documentation/devicetree/bindings/dma/ti/
 +F:    drivers/dma/ti/
 +X:    drivers/dma/ti/cppi41.c
 +F:    include/linux/dma/k3-udma-glue.h
 +F:    include/linux/dma/ti-cppi5.h
 +F:    include/linux/dma/k3-psil.h
 +
  TEXAS INSTRUMENTS' SYSTEM CONTROL INTERFACE (TISCI) PROTOCOL DRIVER
  M:    Nishanth Menon <[email protected]>
  M:    Tero Kristo <[email protected]>
@@@ -18383,7 -18370,7 +18383,7 @@@ F:   include/linux/usb/isp116x.
  
  USB LAN78XX ETHERNET DRIVER
  M:    Woojung Huh <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/microchip,lan78xx.txt
@@@ -18497,7 -18484,7 +18497,7 @@@ F:   drivers/net/usb/smsc75xx.
  
  USB SMSC95XX ETHERNET DRIVER
  M:    Steve Glendinning <[email protected]>
 -M:    Microchip Linux Driver Support <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/usb/smsc95xx.*
@@@ -19044,7 -19031,7 +19044,7 @@@ F:   drivers/input/mouse/vmmouse.
  
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Ronak Doshi <[email protected]>
 -M:    "VMware, Inc." <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/vmxnet3/
@@@ -19518,7 -19505,7 +19518,7 @@@ F:   arch/x86/xen/*swiotlb
  F:    drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
 -M:    Darrick J. Wong <d[email protected]>
 +M:    Darrick J. Wong <d[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported