]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 1c15ca4 cc5f6fa)
Merge tag 'spi-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
authorLinus Torvalds <[email protected]>
Thu, 27 Apr 2023 18:02:26 +0000 (11:02 -0700)
committerLinus Torvalds <[email protected]>
Thu, 27 Apr 2023 18:02:26 +0000 (11:02 -0700)
Pull spi updates from Mark Brown:
 "A fairly standard release for SPI with the exception of a change to
  the API for specifying chip selects done in preparation for supporting
  devices with more than one chip select, this required some mechanical
  changes throughout the tree which have been cooking in -next happily
  for a while.

  There's also a new API to allow us to support TPM chips on half duplex
  controllers.

  Summary:

   - Refactoring in preparation for supporting multiple chip selects for
     a single device, needed by some flash devices, which required a
     change in the SPI device API visible throughout the tree

   - Support for hardware assisted interaction with SPI TPMs on half
     duplex controllers, implemented on nVidia Tedra210 QuadSPI

   - Optimisation for large transfers on fsl-cpm devices

   - Cleanups around device property use which fix some sisues with
     fwnode

   - Use of both void remove() and devm_platform_.*ioremap_resource()

   - Support for AMD Pensando Elba, Amlogic A1, Cadence device mode,
     Intel MetorLake-S and StarFive J7110 QuadSPI"

* tag 'spi-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (185 commits)
  spi: bcm63xx: use macro DEFINE_SIMPLE_DEV_PM_OPS
  spi: tegra210-quad: Enable TPM wait polling
  spi: Add TPM HW flow flag
  spi: bcm63xx: remove PM_SLEEP based conditional compilation
  spi: cadence-quadspi: use macro DEFINE_SIMPLE_DEV_PM_OPS
  spi: spi-cadence: Add support for Slave mode
  spi: spi-cadence: Switch to spi_controller structure
  spi: cadence-quadspi: fix suspend-resume implementations
  spi: dw: Add support for AMD Pensando Elba SoC
  spi: dw: Add AMD Pensando Elba SoC SPI Controller
  spi: cadence-quadspi: Disable the SPI before reconfiguring
  spi: cadence-quadspi: Update the read timeout based on the length
  spi: spi-loopback-test: Add module param for iteration length
  spi: add support for Amlogic A1 SPI Flash Controller
  dt-bindings: spi: add Amlogic A1 SPI controller
  spi: fsl-spi: No need to check transfer length versus word size
  spi: fsl-spi: Change mspi_apply_cpu_mode_quirks() to void
  spi: fsl-cpm: Use 16 bit mode for large transfers with even size
  spi: fsl-spi: Re-organise transfer bits_per_word adaptation
  spi: fsl-spi: Fix CPM/QE mode Litte Endian
  ...

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/net/ieee802154/ca8210.c patch | diff1 | diff2 | blob | history
drivers/platform/x86/serial-multi-instantiate.c patch | diff1 | diff2 | blob | history
drivers/spi/spi-rockchip-sfc.c patch | diff1 | diff2 | blob | history
drivers/spi/spi.c patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index b5169b19449a9c95028fa635af034adc17a3a34a,66cbaade0184ef39c2252a16989b4505363e5740..a5901cbf781ae975693c0252a456629ac9d619ef
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -73,7 -73,7 +73,7 @@@ Tips for patch submitter
        and ideally, should come with a patch proposal. Please do not send
        automated reports to this list either. Such bugs will be handled
        better and faster in the usual public places. See
 -      Documentation/admin-guide/security-bugs.rst for details.
 +      Documentation/process/security-bugs.rst for details.
  
  8.    Happy hacking.
  
@@@ -224,13 -224,13 +224,13 @@@ S:      Orphan / Obsolet
  F:    drivers/net/ethernet/8390/
  
  9P FILE SYSTEM
 -M:    Eric Van Hensbergen <ericvh@gmail.com>
 +M:    Eric Van Hensbergen <ericvh@kernel.org>
  M:    Latchesar Ionkov <[email protected]>
  M:    Dominique Martinet <[email protected]>
  R:    Christian Schoenebeck <[email protected]>
 -L:    v9fs[email protected]
 +L:    v9fs@lists.linux.dev
  S:    Maintained
 -W:    http://swik.net/v9fs
 +W:    http://github.com/v9fs
  Q:    http://patchwork.kernel.org/project/v9fs-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
  T:    git git://github.com/martinetd/linux.git
@@@ -1041,15 -1041,6 +1041,15 @@@ F:    drivers/gpu/drm/amd/include/vi_struc
  F:    include/uapi/linux/kfd_ioctl.h
  F:    include/uapi/linux/kfd_sysfs.h
  
 +AMD PDS CORE DRIVER
 +M:    Shannon Nelson <[email protected]>
 +M:    Brett Creeley <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/networking/device_drivers/ethernet/amd/pds_core.rst
 +F:    drivers/net/ethernet/amd/pds_core/
 +F:    include/linux/pds/
 +
  AMD SPI DRIVER
  M:    Sanjay R Mehta <[email protected]>
  S:    Maintained
@@@ -1080,7 -1071,7 +1080,7 @@@ M:      Naveen Krishna Chatradhi <naveenkris
  R:    Carlos Bilbao <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/x86/amd_hsmp.rst
 +F:    Documentation/arch/x86/amd_hsmp.rst
  F:    arch/x86/include/asm/amd_hsmp.h
  F:    arch/x86/include/uapi/asm/amd_hsmp.h
  F:    drivers/platform/x86/amd/hsmp.c
@@@ -1236,6 -1227,12 +1236,6 @@@ F:     Documentation/devicetree/bindings/ii
  F:    drivers/iio/addac/ad74413r.c
  F:    include/dt-bindings/iio/addac/adi,ad74413r.h
  
 -ANALOG DEVICES INC AD9389B DRIVER
 -M:    Hans Verkuil <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/media/i2c/ad9389b*
 -
  ANALOG DEVICES INC ADA4250 DRIVER
  M:    Antoniu Miclaus <[email protected]>
  L:    [email protected]
@@@ -2075,7 -2072,6 +2075,7 @@@ M:      Alexander Sverdlin <alexander.sverdl
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml
 +F:    Documentation/devicetree/bindings/sound/cirrus,ep9301-*
  F:    arch/arm/boot/compressed/misc-ep93xx.h
  F:    arch/arm/mach-ep93xx/
  F:    drivers/iio/adc/ep93xx_adc.c
@@@ -2279,7 -2275,7 +2279,7 @@@ F:      arch/arm/boot/dts/intel-ixp
  F:    arch/arm/mach-ixp4xx/
  F:    drivers/bus/intel-ixp4xx-eb.c
  F:    drivers/clocksource/timer-ixp4xx.c
 -F:    drivers/crypto/ixp4xx_crypto.c
 +F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  F:    drivers/gpio/gpio-ixp4xx.c
  F:    drivers/irqchip/irq-ixp4xx.c
  
@@@ -2608,12 -2604,6 +2608,12 @@@ F:    include/dt-bindings/*/qcom
  F:    include/linux/*/qcom*
  F:    include/linux/soc/qcom/
  
 +ARM/QUALCOMM CHROMEBOOK SUPPORT
 +R:    [email protected]
 +F:    arch/arm64/boot/dts/qcom/sc7180*
 +F:    arch/arm64/boot/dts/qcom/sc7280*
 +F:    arch/arm64/boot/dts/qcom/sdm845-cheza*
 +
  ARM/RDA MICRO ARCHITECTURE
  M:    Manivannan Sadhasivam <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2664,7 -2654,6 +2664,7 @@@ F:      arch/arm64/boot/dts/renesas
  F:    arch/riscv/boot/dts/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
 +K:    \brenesas,
  
  ARM/RISCPC ARCHITECTURE
  M:    Russell King <[email protected]>
@@@ -4442,13 -4431,6 +4442,13 @@@ S:    Maintaine
  F:    drivers/scsi/BusLogic.*
  F:    drivers/scsi/FlashPoint.*
  
 +BXCAN CAN NETWORK DRIVER
 +M:    Dario Binacchi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/can/st,stm32-bxcan.yaml
 +F:    drivers/net/can/bxcan.c
 +
  C-MEDIA CMI8788 DRIVER
  M:    Clemens Ladisch <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -4479,14 -4461,14 +4479,14 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/net/ieee802154/ca8210.c
  
  CANAAN/KENDRYTE K210 SOC FPIOA DRIVER
 -M:    Damien Le Moal <d[email protected]>
 +M:    Damien Le Moal <d[email protected]>
  L:    [email protected]
  L:    [email protected] (pinctrl driver)
  F:    Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml
  F:    drivers/pinctrl/pinctrl-k210.c
  
  CANAAN/KENDRYTE K210 SOC RESET CONTROLLER DRIVER
 -M:    Damien Le Moal <d[email protected]>
 +M:    Damien Le Moal <d[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -4494,7 -4476,7 +4494,7 @@@ F:      Documentation/devicetree/bindings/re
  F:    drivers/reset/reset-k210.c
  
  CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER
 -M:    Damien Le Moal <d[email protected]>
 +M:    Damien Le Moal <d[email protected]>
  L:    [email protected]
  S:    Maintained
  F:      Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
@@@ -4923,7 -4905,6 +4923,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
  F:    include/dt-bindings/sound/cs*
 +F:    include/sound/cs*
  F:    sound/pci/hda/cs*
  F:    sound/pci/hda/hda_cs_dsp_ctl.*
  F:    sound/soc/codecs/cs*
@@@ -5959,6 -5940,11 +5959,6 @@@ F:     drivers/devfreq/event
  F:    include/dt-bindings/pmu/exynos_ppmu.h
  F:    include/linux/devfreq-event.h
  
 -DEVICE NUMBER REGISTRY
 -M:    Torben Mathiasen <[email protected]>
 -S:    Maintained
 -W:    http://lanana.org/docs/device-list/index.html
 -
  DEVICE RESOURCE MANAGEMENT HELPERS
  M:    Hans de Goede <[email protected]>
  R:    Matti Vaittinen <[email protected]>
@@@ -5985,7 -5971,7 +5985,7 @@@ F:      include/linux/dm-*.
  F:    include/uapi/linux/dm-*.h
  
  DEVLINK
 -M:    Jiri Pirko <jiri@nvidia.com>
 +M:    Jiri Pirko <jiri@resnulli.us>
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/devlink
@@@ -6221,7 -6207,6 +6221,7 @@@ DOCUMENTATION REPORTING ISSUE
  M:    Thorsten Leemhuis <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/admin-guide/quickly-build-trimmed-linux.rst
  F:    Documentation/admin-guide/reporting-issues.rst
  
  DOCUMENTATION SCRIPTS
@@@ -6533,7 -6518,6 +6533,7 @@@ L:      [email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +B:    https://gitlab.freedesktop.org/drm/msm/-/issues
  T:    git https://gitlab.freedesktop.org/drm/msm.git
  F:    Documentation/devicetree/bindings/display/msm/
  F:    drivers/gpu/drm/msm/
@@@ -6553,13 -6537,6 +6553,13 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml
  F:    drivers/gpu/drm/panel/panel-novatek-nt35560.c
  
 +DRM DRIVER FOR NOVATEK NT36523 PANELS
 +M:    Jianhua Lu <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
 +F:    drivers/gpu/drm/panel/panel-novatek-nt36523.c
 +
  DRM DRIVER FOR NOVATEK NT36672A PANELS
  M:    Sumit Semwal <[email protected]>
  S:    Maintained
@@@ -6640,16 -6617,6 +6640,16 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
  F:    drivers/gpu/drm/panel/panel-samsung-db7430.c
  
 +DRM DRIVER FOR SAMSUNG MIPI DSIM BRIDGE
 +M:    Inki Dae <[email protected]>
 +M:    Jagan Teki <[email protected]>
 +M:    Marek Szyprowski <[email protected]>
 +S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml
 +F:    drivers/gpu/drm/bridge/samsung-dsim.c
 +F:    include/drm/bridge/samsung-dsim.h
 +
  DRM DRIVER FOR SAMSUNG S6D27A1 PANELS
  M:    Markuss Broks <[email protected]>
  S:    Maintained
@@@ -6857,7 -6824,6 +6857,7 @@@ S:      Maintaine
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/bridge/
  F:    drivers/gpu/drm/bridge/
 +F:    include/drm/drm_bridge.h
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
@@@ -6950,7 -6916,6 +6950,7 @@@ F:      drivers/phy/mediatek/phy-mtk-mipi
  
  DRM DRIVERS FOR NVIDIA TEGRA
  M:    Thierry Reding <[email protected]>
 +M:    Mikko Perttunen <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -7079,7 -7044,7 +7079,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/xlnx/
  
  DRM PANEL DRIVERS
 -M:    Thierry Reding <[email protected]>
 +M:    Neil Armstrong <[email protected]>
  R:    Sam Ravnborg <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -7763,7 -7728,6 +7763,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  F:    Documentation/filesystems/ext4/
  F:    fs/ext4/
  F:    include/trace/events/ext4.h
 +F:    include/uapi/linux/ext4.h
  
  Extended Verification Module (EVM)
  M:    Mimi Zohar <[email protected]>
@@@ -8136,7 -8100,7 +8136,7 @@@ M:      Pankaj Gupta <[email protected]
  M:    Gaurav Jain <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/crypto/fsl-sec4.txt
 +F:    Documentation/devicetree/bindings/crypto/fsl,sec-v4.0*
  F:    drivers/crypto/caam/
  
  FREESCALE COLDFIRE M5441X MMC DRIVER
@@@ -8252,7 -8216,6 +8252,7 @@@ F:      drivers/net/ethernet/freescale/dpa
  
  FREESCALE QORIQ DPAA FMAN DRIVER
  M:    Madalin Bucur <[email protected]>
 +R:    Sean Anderson <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/fsl-fman.txt
@@@ -8284,23 -8247,6 +8284,23 @@@ S:    Maintaine
  F:    drivers/soc/fsl/qe/
  F:    include/soc/fsl/qe/
  
 +FREESCALE QUICC ENGINE QMC DRIVER
 +M:    Herve Codina <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml
 +F:    drivers/soc/fsl/qe/qmc.c
 +F:    include/soc/fsl/qe/qmc.h
 +
 +FREESCALE QUICC ENGINE TSA DRIVER
 +M:    Herve Codina <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml
 +F:    drivers/soc/fsl/qe/tsa.c
 +F:    drivers/soc/fsl/qe/tsa.h
 +F:    include/dt-bindings/soc/cpm1-fsl,tsa.h
 +
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <[email protected]>
  L:    [email protected]
@@@ -8352,14 -8298,6 +8352,14 @@@ F:    sound/soc/fsl/fsl
  F:    sound/soc/fsl/imx*
  F:    sound/soc/fsl/mpc8610_hpcd.c
  
 +FREESCALE SOC SOUND QMC DRIVER
 +M:    Herve Codina <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml
 +F:    sound/soc/fsl/fsl_qmc_audio.c
 +
  FREESCALE USB PERIPHERAL DRIVERS
  M:    Li Yang <[email protected]>
  L:    [email protected]
@@@ -8479,6 -8417,14 +8479,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/platform/x86/fujitsu-laptop.c
  
 -FUJITSU M-5MO LS CAMERA ISP DRIVER
 -M:    Kyungmin Park <[email protected]>
 -M:    Heungjun Kim <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/media/i2c/m5mols/
 -F:    include/media/i2c/m5mols.h
 -
  FUJITSU TABLET EXTRAS
  M:    Robert Gerlach <[email protected]>
  L:    [email protected]
@@@ -8743,7 -8689,7 +8743,7 @@@ F:      drivers/input/touchscreen/goodix
  
  GOOGLE ETHERNET DRIVERS
  M:    Jeroen de Borst <[email protected]>
 -M:    Catherine Sullivan <csully@google.com>
 +M:    Praveen Kaligineedi <pkaligineedi@google.com>
  R:    Shailend Chand <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -8806,6 -8752,7 +8806,6 @@@ F:      Documentation/admin-guide/gpio
  F:    Documentation/devicetree/bindings/gpio/
  F:    Documentation/driver-api/gpio/
  F:    drivers/gpio/
 -F:    include/asm-generic/gpio.h
  F:    include/dt-bindings/gpio/
  F:    include/linux/gpio.h
  F:    include/linux/gpio/
@@@ -8992,17 -8939,6 +8992,17 @@@ Q:    http://patchwork.linuxtv.org/project
  T:    git git://linuxtv.org/anttip/media_tree.git
  F:    drivers/media/usb/hackrf/
  
 +HANDSHAKE UPCALL FOR TRANSPORT LAYER SECURITY
 +M:    Chuck Lever <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/netlink/specs/handshake.yaml
 +F:    Documentation/networking/tls-handshake.rst
 +F:    include/net/handshake.h
 +F:    include/trace/events/handshake.h
 +F:    net/handshake/
 +
  HANTRO VPU CODEC DRIVER
  M:    Ezequiel Garcia <[email protected]>
  M:    Philipp Zabel <[email protected]>
@@@ -9792,7 -9728,7 +9792,7 @@@ F:      include/linux/i3c
  IA64 (Itanium) PLATFORM
  L:    [email protected]
  S:    Orphan
 -F:    Documentation/ia64/
 +F:    Documentation/arch/ia64/
  F:    arch/ia64/
  
  IBM Operation Panel Input Driver
@@@ -10346,14 -10282,12 +10346,14 @@@ M:        Andy Shevchenko <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
 +F:    drivers/gpio/gpio-elkhartlake.c
  F:    drivers/gpio/gpio-ich.c
  F:    drivers/gpio/gpio-merrifield.c
  F:    drivers/gpio/gpio-ml-ioh.c
  F:    drivers/gpio/gpio-pch.c
  F:    drivers/gpio/gpio-sch.c
  F:    drivers/gpio/gpio-sodaville.c
 +F:    drivers/gpio/gpio-tangier.c
  
  INTEL GVT-g DRIVERS (Intel GPU Virtualization)
  M:    Zhenyu Wang <[email protected]>
@@@ -10446,7 -10380,7 +10446,7 @@@ INTEL IXP4XX CRYPTO SUPPOR
  M:    Corentin Labbe <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/crypto/ixp4xx_crypto.c
 +F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  
  INTEL ISHTP ECLITE DRIVER
  M:    Sumesh K Naduvalath <[email protected]>
@@@ -10481,11 -10415,11 +10481,11 @@@ INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVE
  M:    Daniele Alessandrelli <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
 -F:    drivers/crypto/keembay/Kconfig
 -F:    drivers/crypto/keembay/Makefile
 -F:    drivers/crypto/keembay/keembay-ocs-aes-core.c
 -F:    drivers/crypto/keembay/ocs-aes.c
 -F:    drivers/crypto/keembay/ocs-aes.h
 +F:    drivers/crypto/intel/keembay/Kconfig
 +F:    drivers/crypto/intel/keembay/Makefile
 +F:    drivers/crypto/intel/keembay/keembay-ocs-aes-core.c
 +F:    drivers/crypto/intel/keembay/ocs-aes.c
 +F:    drivers/crypto/intel/keembay/ocs-aes.h
  
  INTEL KEEM BAY OCS ECC CRYPTO DRIVER
  M:    Daniele Alessandrelli <[email protected]>
@@@ -10493,20 -10427,20 +10493,20 @@@ M:        Prabhjot Khurana <prabhjot.khurana@i
  M:    Mark Gross <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
 -F:    drivers/crypto/keembay/Kconfig
 -F:    drivers/crypto/keembay/Makefile
 -F:    drivers/crypto/keembay/keembay-ocs-ecc.c
 +F:    drivers/crypto/intel/keembay/Kconfig
 +F:    drivers/crypto/intel/keembay/Makefile
 +F:    drivers/crypto/intel/keembay/keembay-ocs-ecc.c
  
  INTEL KEEM BAY OCS HCU CRYPTO DRIVER
  M:    Daniele Alessandrelli <[email protected]>
  M:    Declan Murphy <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml
 -F:    drivers/crypto/keembay/Kconfig
 -F:    drivers/crypto/keembay/Makefile
 -F:    drivers/crypto/keembay/keembay-ocs-hcu-core.c
 -F:    drivers/crypto/keembay/ocs-hcu.c
 -F:    drivers/crypto/keembay/ocs-hcu.h
 +F:    drivers/crypto/intel/keembay/Kconfig
 +F:    drivers/crypto/intel/keembay/Makefile
 +F:    drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
 +F:    drivers/crypto/intel/keembay/ocs-hcu.c
 +F:    drivers/crypto/intel/keembay/ocs-hcu.h
  
  INTEL THUNDER BAY EMMC PHY DRIVER
  M:    Nandhini Srikandan <[email protected]>
@@@ -10713,7 -10647,7 +10713,7 @@@ L:   [email protected]
  S:    Supported
  W:    http://tboot.sourceforge.net
  T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
 -F:    Documentation/x86/intel_txt.rst
 +F:    Documentation/arch/x86/intel_txt.rst
  F:    arch/x86/kernel/tboot.c
  F:    include/linux/tboot.h
  
@@@ -10724,7 -10658,7 +10724,7 @@@ L:   [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/intel-sgx/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
 -F:    Documentation/x86/sgx.rst
 +F:    Documentation/arch/x86/sgx.rst
  F:    arch/x86/entry/vdso/vsgx.S
  F:    arch/x86/include/asm/sgx.h
  F:    arch/x86/include/uapi/asm/sgx.h
@@@ -11823,7 -11757,7 +11823,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    drivers/ata/sata_promise.*
  
  LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
 -M:    Damien Le Moal <d[email protected]>
 +M:    Damien Le Moal <d[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
@@@ -11959,7 -11893,6 +11959,7 @@@ M:   Scott Wood <[email protected]
  L:    [email protected]
  S:    Odd fixes
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
 +F:    Documentation/devicetree/bindings/cache/freescale-l2cache.txt
  F:    Documentation/devicetree/bindings/powerpc/fsl/
  F:    arch/powerpc/platforms/83xx/
  F:    arch/powerpc/platforms/85xx/
@@@ -12183,13 -12116,6 +12183,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
  F:    drivers/pinctrl/pinctrl-loongson2.c
  
 +LOONGSON GPIO DRIVER
 +M:    Yinbo Zhu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
 +F:    drivers/gpio/gpio-loongson-64bit.c
 +
  LOONGSON-2 SOC SERIES CLOCK DRIVER
  M:    Yinbo Zhu <[email protected]>
  L:    [email protected]
@@@ -12349,7 -12275,7 +12349,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
  F:    Documentation/networking/mac80211-injection.rst
  F:    Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
 -F:    drivers/net/wireless/mac80211_hwsim.[ch]
 +F:    drivers/net/wireless/virtual/mac80211_hwsim.[ch]
  F:    include/net/mac80211.h
  F:    net/mac80211/
  
@@@ -13116,14 -13042,6 +13116,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/mediatek/
  
 +MEDIATEK ETHERNET PCS DRIVER
 +M:    Alexander Couzens <[email protected]>
 +M:    Daniel Golle <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/pcs/pcs-mtk-lynxi.c
 +F:    include/linux/pcs/pcs-mtk-lynxi.h
 +
  MEDIATEK I2C CONTROLLER DRIVER
  M:    Qii Wang <[email protected]>
  L:    [email protected]
@@@ -13248,11 -13166,8 +13248,11 @@@ MEDIATEK SWITCH DRIVE
  M:    Sean Wang <[email protected]>
  M:    Landen Chao <[email protected]>
  M:    DENG Qingfang <[email protected]>
 +M:    Daniel Golle <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    drivers/net/dsa/mt7530-mdio.c
 +F:    drivers/net/dsa/mt7530-mmio.c
  F:    drivers/net/dsa/mt7530.*
  F:    net/dsa/tag_mtk.c
  
@@@ -13678,13 -13593,9 +13678,13 @@@ F: Documentation/devicetree/bindings/se
  F:    drivers/spi/spi-at91-usart.c
  
  MICROCHIP AUDIO ASOC DRIVERS
 -M:    Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    Documentation/devicetree/bindings/sound/atmel*
 +F:    Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt
 +F:    Documentation/devicetree/bindings/sound/microchip,sama7g5-*
 +F:    Documentation/devicetree/bindings/sound/mikroe,mikroe-proto.txt
  F:    sound/soc/atmel
  
  MICROCHIP CSI2DC DRIVER
@@@ -13857,10 -13768,9 +13857,10 @@@ S: Supporte
  F:    drivers/spi/spi-atmel.*
  
  MICROCHIP SSC DRIVER
 -M:    Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 +F:    Documentation/devicetree/bindings/misc/atmel-ssc.txt
  F:    drivers/misc/atmel-ssc.c
  F:    include/linux/atmel-ssc.h
  
@@@ -14228,13 -14138,6 +14228,13 @@@ S: Odd Fixe
  F:    Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
  F:    drivers/net/ieee802154/mrf24j40.c
  
 +MSI EC DRIVER
 +M:    Nikita Kravets <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    https://github.com/BeardOverflow/msi-ec
 +F:    drivers/platform/x86/msi-ec.*
 +
  MSI LAPTOP SUPPORT
  M:    "Lee, Chun-Yi" <[email protected]>
  L:    [email protected]
@@@ -14279,6 -14182,14 +14279,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/mtd/devices/docg3*
  
 -MT9M032 APTINA SENSOR DRIVER
 -M:    Laurent Pinchart <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/i2c/mt9m032.c
 -F:    include/media/i2c/mt9m032.h
 -
  MT9P031 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -14288,6 -14199,14 +14288,6 @@@ F:  Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/mt9p031.c
  F:    include/media/i2c/mt9p031.h
  
 -MT9T001 APTINA CAMERA SENSOR
 -M:    Laurent Pinchart <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -T:    git git://linuxtv.org/media_tree.git
 -F:    drivers/media/i2c/mt9t001.c
 -F:    include/media/i2c/mt9t001.h
 -
  MT9T112 APTINA CAMERA SENSOR
  M:    Jacopo Mondi <[email protected]>
  L:    [email protected]
@@@ -14674,14 -14593,11 +14674,14 @@@ F:        net/netlabel
  
  NETWORKING [MPTCP]
  M:    Matthieu Baerts <[email protected]>
 +M:    Mat Martineau <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://github.com/multipath-tcp/mptcp_net-next/wiki
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
 +T:    git https://github.com/multipath-tcp/mptcp_net-next.git export-net
 +T:    git https://github.com/multipath-tcp/mptcp_net-next.git export
  F:    Documentation/networking/mptcp-sysctl.rst
  F:    include/net/mptcp.h
  F:    include/trace/events/mptcp.h
@@@ -14740,10 -14656,13 +14740,10 @@@ F:        net/ipv4/nexthop.
  
  NFC SUBSYSTEM
  M:    Krzysztof Kozlowski <[email protected]>
 -L:    [email protected] (subscribers-only)
  L:    [email protected]
  S:    Maintained
 -B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/net/nfc/
  F:    drivers/nfc/
 -F:    include/linux/platform_data/nfcmrvl.h
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
  F:    net/nfc/
@@@ -14751,6 -14670,7 +14751,6 @@@
  NFC VIRTUAL NCI DEVICE DRIVER
  M:    Bongsu Jeon <[email protected]>
  L:    [email protected]
 -L:    [email protected] (subscribers-only)
  S:    Supported
  F:    drivers/nfc/virtual_ncidev.c
  F:    tools/testing/selftests/nci/
@@@ -14826,7 -14746,7 +14826,7 @@@ F:   include/uapi/linux/nitro_enclaves.
  F:    samples/nitro_enclaves/
  
  NOHZ, DYNTICKS SUPPORT
 -M:    Frederic Weisbecker <f[email protected]>
 +M:    Frederic Weisbecker <f[email protected]>
  M:    Thomas Gleixner <[email protected]>
  M:    Ingo Molnar <[email protected]>
  L:    [email protected]
@@@ -14952,12 -14872,12 +14952,12 @@@ M:        Sagi Grimberg <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://git.infradead.org/nvme.git
 -T:    git://git.infradead.org/nvme.git
 +T:    git git://git.infradead.org/nvme.git
  F:    Documentation/nvme/
 -F:    drivers/nvme/host/
  F:    drivers/nvme/common/
 -F:    include/linux/nvme.h
 +F:    drivers/nvme/host/
  F:    include/linux/nvme-*.h
 +F:    include/linux/nvme.h
  F:    include/uapi/linux/nvme_ioctl.h
  
  NVM EXPRESS FABRICS AUTHENTICATION
@@@ -14992,7 -14912,7 +14992,7 @@@ M:   Chaitanya Kulkarni <[email protected]
  L:    [email protected]
  S:    Supported
  W:    http://git.infradead.org/nvme.git
 -T:    git://git.infradead.org/nvme.git
 +T:    git git://git.infradead.org/nvme.git
  F:    drivers/nvme/target/
  
  NVMEM FRAMEWORK
@@@ -15041,13 -14961,6 +15041,13 @@@ F: Documentation/devicetree/bindings/cl
  F:    drivers/clk/imx/
  F:    include/dt-bindings/clock/imx*
  
 +NXP i.MX 8M ISI DRIVER
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
 +F:    drivers/media/platform/nxp/imx8-isi/
 +
  NXP i.MX 8MQ DCSS DRIVER
  M:    Laurentiu Palcu <[email protected]>
  R:    Lucas Stach <[email protected]>
@@@ -15129,6 -15042,7 +15129,6 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/tfa989x.c
  
  NXP-NCI NFC DRIVER
 -L:    [email protected] (subscribers-only)
  S:    Orphan
  F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
  F:    drivers/nfc/nxp-nci
@@@ -15165,7 -15079,7 +15165,7 @@@ F:   Documentation/hwmon/nzxt-smart2.rs
  F:    drivers/hwmon/nzxt-smart2.c
  
  OBJAGG
 -M:    Jiri Pirko <jiri@nvidia.com>
 +M:    Jiri Pirko <jiri@resnulli.us>
  L:    [email protected]
  S:    Supported
  F:    include/linux/objagg.h
@@@ -15475,7 -15389,6 +15475,7 @@@ M:   Shunqian Zheng <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
  F:    drivers/media/i2c/ov2685.c
  
  OMNIVISION OV2740 SENSOR DRIVER
@@@ -15567,7 -15480,7 +15567,7 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ov7740.c
  
  OMNIVISION OV8856 SENSOR DRIVER
 -M:    Dongchun Zhu <dongchun.zhu@mediatek.com>
 +M:    Sakari Ailus <[email protected].com>
  L:    [email protected]
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
@@@ -15710,13 -15623,6 +15710,13 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/ptp/ptp_ocp.c
  
 +INTEL PTP DFL ToD DRIVER
 +M:    Tianfei Zhang <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/ptp/ptp_dfl_tod.c
 +
  OPENCORES I2C BUS DRIVER
  M:    Peter Korsgaard <[email protected]>
  M:    Andrew Lunn <[email protected]>
@@@ -15736,7 -15642,7 +15736,7 @@@ S:   Maintaine
  W:    http://openrisc.io
  T:    git https://github.com/openrisc/linux.git
  F:    Documentation/devicetree/bindings/openrisc/
 -F:    Documentation/openrisc/
 +F:    Documentation/arch/openrisc/
  F:    arch/openrisc/
  F:    drivers/irqchip/irq-ompic.c
  F:    drivers/irqchip/irq-or1k-*
@@@ -15932,7 -15838,7 +15932,7 @@@ W:   https://parisc.wiki.kernel.or
  Q:    http://patchwork.kernel.org/project/linux-parisc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
 -F:    Documentation/parisc/
 +F:    Documentation/arch/parisc/
  F:    arch/parisc/
  F:    drivers/char/agp/parisc-agp.c
  F:    drivers/input/misc/hp_sdc_rtc.c
@@@ -15947,7 -15853,7 +15947,7 @@@ F:   drivers/video/logo/logo_parisc
  F:    include/linux/hp_sdc.h
  
  PARMAN
 -M:    Jiri Pirko <jiri@nvidia.com>
 +M:    Jiri Pirko <jiri@resnulli.us>
  L:    [email protected]
  S:    Supported
  F:    include/linux/parman.h
@@@ -16067,8 -15973,6 +16067,8 @@@ M:   Lucas Stach <[email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml
 +F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml
  F:    Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml
  F:    drivers/pci/controller/dwc/*imx6*
  
@@@ -16427,6 -16331,12 +16427,6 @@@ S:  Maintaine
  F:    crypto/pcrypt.c
  F:    include/crypto/pcrypt.h
  
 -PEAQ WMI HOTKEYS DRIVER
 -M:    Hans de Goede <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/platform/x86/peaq-wmi.c
 -
  PECI HARDWARE MONITORING DRIVERS
  M:    Iwona Winiarska <[email protected]>
  L:    [email protected]
@@@ -16863,8 -16773,9 +16863,8 @@@ F:   include/uapi/linux/if_pppol2tp.
  F:    net/l2tp/l2tp_ppp.c
  
  PPP PROTOCOL DRIVERS AND COMPRESSORS
 -M:    Paul Mackerras <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/ppp/ppp_*
  
  PPS SUPPORT
@@@ -17108,7 -17019,7 +17108,7 @@@ QAT DRIVE
  M:    Giovanni Cabiddu <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/crypto/qat/
 +F:    drivers/crypto/intel/qat/
  
  QCOM AUDIO (ASoC) DRIVERS
  M:    Srinivas Kandagatla <[email protected]>
@@@ -17258,12 -17169,6 +17258,12 @@@ F: fs/qnx4
  F:    include/uapi/linux/qnx4_fs.h
  F:    include/uapi/linux/qnxtypes.h
  
 +QNX6 FILESYSTEM
 +S:    Orphan
 +F:    Documentation/filesystems/qnx6.rst
 +F:    fs/qnx6/
 +F:    include/linux/qnx6_fs.h
 +
  QORIQ DPAA2 FSL-MC BUS DRIVER
  M:    Stuart Yoder <[email protected]>
  M:    Laurentiu Tudor <[email protected]>
@@@ -17292,7 -17197,7 +17292,7 @@@ S:   Supporte
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath10k/
 -F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
 +F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml
  
  QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
@@@ -17328,7 -17233,6 +17328,7 @@@ F:   drivers/net/wwan/qcom_bam_dmux.
  QUALCOMM CAMERA SUBSYSTEM DRIVER
  M:    Robert Foss <[email protected]>
  M:    Todor Tomov <[email protected]>
 +M:    Bryan O'Donoghue <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/media/qcom_camss.rst
@@@ -17344,16 -17248,6 +17344,16 @@@ F: Documentation/devicetree/bindings/cl
  F:    drivers/clk/qcom/
  F:    include/dt-bindings/clock/qcom,*
  
 +QUALCOMM CLOUD AI (QAIC) DRIVER
 +M:    Jeffrey Hugo <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/accel/qaic/
 +F:    drivers/accel/qaic/
 +F:    include/uapi/drm/qaic_accel.h
 +
  QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
  M:    Bjorn Andersson <[email protected]>
  M:    Konrad Dybcio <[email protected]>
@@@ -17376,7 -17270,6 +17376,7 @@@ M:   Thara Gopinath <thara.gopinath@gmail
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/crypto/qcom-qce.yaml
  F:    drivers/crypto/qce/
  
  QUALCOMM EMAC GIGABIT ETHERNET DRIVER
@@@ -17390,7 -17283,7 +17390,7 @@@ M:   Vinod Koul <[email protected]
  R:    Bhupesh Sharma <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/devicetree/bindings/net/qcom,ethqos.txt
 +F:    Documentation/devicetree/bindings/net/qcom,ethqos.yaml
  F:    drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
  
  QUALCOMM FASTRPC DRIVER
@@@ -17650,7 -17543,7 +17650,7 @@@ F:   include/ras/ras_event.
  RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
  L:    [email protected]
  S:    Orphan
 -F:    drivers/net/wireless/ray*
 +F:    drivers/net/wireless/legacy/ray*
  
  RC-CORE / LIRC FRAMEWORK
  M:    Sean Young <[email protected]>
@@@ -17736,7 -17629,7 +17736,7 @@@ M:   Fenghua Yu <[email protected]
  M:    Reinette Chatre <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/x86/resctrl*
 +F:    Documentation/arch/x86/resctrl*
  F:    arch/x86/include/asm/resctrl.h
  F:    arch/x86/kernel/cpu/resctrl/
  F:    tools/testing/selftests/resctrl/
@@@ -17745,13 -17638,11 +17745,13 @@@ READ-COPY UPDATE (RCU
  M:    "Paul E. McKenney" <[email protected]>
  M:    Frederic Weisbecker <[email protected]> (kernel/rcu/tree_nocb.h)
  M:    Neeraj Upadhyay <[email protected]> (kernel/rcu/tasks.h)
 +M:    Joel Fernandes <[email protected]>
  M:    Josh Triplett <[email protected]>
 +M:    Boqun Feng <[email protected]>
  R:    Steven Rostedt <[email protected]>
  R:    Mathieu Desnoyers <[email protected]>
  R:    Lai Jiangshan <[email protected]>
 -R:    Joel Fernandes <[email protected]>
 +R:    Zqiang <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.rdrop.com/users/paulmck/RCU/
@@@ -18099,7 -17990,7 +18099,7 @@@ F:   Documentation/devicetree/bindings/sp
  F:    Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
  F:    arch/riscv/boot/dts/microchip/
  F:    drivers/char/hw_random/mpfs-rng.c
 -F:    drivers/clk/microchip/clk-mpfs.c
 +F:    drivers/clk/microchip/clk-mpfs*.c
  F:    drivers/i2c/busses/i2c-microchip-corei2c.c
  F:    drivers/mailbox/mailbox-mpfs.c
  F:    drivers/pci/controller/pcie-microchip-host.c
@@@ -18400,9 -18291,8 +18400,9 @@@ F:   drivers/s390/block/dasd
  F:    include/linux/dasd_mod.h
  
  S390 IOMMU (PCI)
 +M:    Niklas Schnelle <[email protected]>
  M:    Matthew Rosato <[email protected]>
 -M:    Gerald Schaefer <[email protected]>
 +R:    Gerald Schaefer <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/iommu/s390-iommu.c
@@@ -18597,6 -18487,7 +18597,6 @@@ F:   include/media/drv-intf/s3c_camif.
  
  SAMSUNG S3FWRN5 NFC DRIVER
  M:    Krzysztof Kozlowski <[email protected]>
 -L:    [email protected] (subscribers-only)
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
  F:    drivers/nfc/s3fwrn5
@@@ -18606,7 -18497,6 +18606,7 @@@ M:   Sylwester Nawrocki <s.nawrocki@samsu
  M:    Andrzej Hajda <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/devicetree/bindings/media/samsung,s5c73m3.yaml
  F:    drivers/media/i2c/s5c73m3/*
  
  SAMSUNG S5K5BAF CAMERA DRIVER
@@@ -18631,11 -18521,6 +18631,11 @@@ M: Sylwester Nawrocki <s.nawrocki@samsu
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.linuxtv.org/project/linux-media/list/
 +F:    Documentation/devicetree/bindings/media/samsung,exynos4210-csis.yaml
 +F:    Documentation/devicetree/bindings/media/samsung,exynos4210-fimc.yaml
 +F:    Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml
 +F:    Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-lite.yaml
 +F:    Documentation/devicetree/bindings/media/samsung,fimc.yaml
  F:    drivers/media/platform/samsung/exynos4-is/
  
  SAMSUNG SOC CLOCK DRIVERS
@@@ -18658,7 -18543,7 +18658,7 @@@ F:   include/linux/clk/samsung.
  
  SAMSUNG SPI DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
- M:    Andi Shyti <andi@etezian.org>
+ M:    Andi Shyti <andi.shyti@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -18917,7 -18802,7 +18917,7 @@@ F:   include/uapi/linux/sed
  SECURITY CONTACT
  M:    Security Officers <[email protected]>
  S:    Supported
 -F:    Documentation/admin-guide/security-bugs.rst
 +F:    Documentation/process/security-bugs.rst
  
  SECURITY SUBSYSTEM
  M:    Paul Moore <[email protected]>
@@@ -18939,8 -18824,8 +18939,8 @@@ S:   Supporte
  W:    https://selinuxproject.org
  W:    https://github.com/SELinuxProject
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
 -F:    Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
 -F:    Documentation/ABI/obsolete/sysfs-selinux-disable
 +F:    Documentation/ABI/removed/sysfs-selinux-checkreqprot
 +F:    Documentation/ABI/removed/sysfs-selinux-disable
  F:    Documentation/admin-guide/LSM/SELinux.rst
  F:    include/trace/events/avc.h
  F:    include/uapi/linux/selinux_netlink.h
@@@ -19026,14 -18911,6 +19026,14 @@@ S: Supporte
  F:    Documentation/networking/devlink/sfc.rst
  F:    drivers/net/ethernet/sfc/
  
 +SFCTEMP HWMON DRIVER
 +M:    Emil Renner Berthing <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
 +F:    Documentation/hwmon/sfctemp.rst
 +F:    drivers/hwmon/sfctemp.c
 +
  SFF/SFP/SFP+ MODULE SUPPORT
  M:    Russell King <[email protected]>
  L:    [email protected]
@@@ -19122,7 -18999,6 +19122,7 @@@ L:   [email protected]
  S:    Odd Fixes
  W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/silabs,si470x.yaml
  F:    drivers/media/radio/si470x/radio-si470x-i2c.c
  
  SI470X FM RADIO RECEIVER USB DRIVER
@@@ -19198,7 -19074,6 +19198,7 @@@ M:   Conor Dooley <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 +F:    Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
  F:    drivers/soc/sifive/
  
  SILEAD TOUCHSCREEN DRIVER
@@@ -19275,7 -19150,9 +19275,7 @@@ W:   http://www.brownhat.org/sis900.htm
  F:    drivers/net/ethernet/sis/sis900.*
  
  SIS FRAMEBUFFER DRIVER
 -M:    Thomas Winischhofer <[email protected]>
 -S:    Maintained
 -W:    http://www.winischhofer.net/linuxsisvga.shtml
 +S:    Orphan
  F:    Documentation/fb/sisfb.rst
  F:    drivers/video/fbdev/sis/
  F:    include/video/sisfb.h
@@@ -20030,13 -19907,6 +20030,13 @@@ M: Emil Renner Berthing <[email protected]
  S:    Maintained
  F:    arch/riscv/boot/dts/starfive/
  
 +STARFIVE DWMAC GLUE LAYER
 +M:    Emil Renner Berthing <[email protected]>
 +M:    Samin Guo <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
 +
  STARFIVE JH7100 CLOCK DRIVERS
  M:    Emil Renner Berthing <[email protected]>
  S:    Maintained
@@@ -20247,7 -20117,7 +20247,7 @@@ M:   John Paul Adrian Glaubitz <glaubitz@
  L:    [email protected]
  S:    Maintained
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -F:    Documentation/sh/
 +F:    Documentation/arch/sh/
  F:    arch/sh/
  F:    drivers/sh/
  
@@@ -20307,7 -20177,7 +20307,7 @@@ M:   Vineet Gupta <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
 -F:    Documentation/arc/
 +F:    Documentation/arch/arc
  F:    Documentation/devicetree/bindings/arc/*
  F:    Documentation/devicetree/bindings/interrupt-controller/snps,arc*
  F:    arch/arc/
@@@ -20777,6 -20647,7 +20777,6 @@@ F:   sound/soc/codecs/tscs*.
  TENSILICA XTENSA PORT (xtensa)
  M:    Chris Zankel <[email protected]>
  M:    Max Filippov <[email protected]>
 -L:    [email protected]
  S:    Maintained
  T:    git https://github.com/jcmvbkbc/linux-xtensa.git
  F:    arch/xtensa/
@@@ -20906,7 -20777,7 +20906,7 @@@ L:   [email protected]
  S:    Maintained
  F:    Documentation/driver-api/thermal/power_allocator.rst
  F:    drivers/thermal/gov_power_allocator.c
 -F:    include/trace/events/thermal_power_allocator.h
 +F:    drivers/thermal/thermal_trace_ipa.h
  
  THINKPAD ACPI EXTRAS DRIVER
  M:    Henrique de Moraes Holschuh <[email protected]>
@@@ -21112,6 -20983,7 +21112,6 @@@ F:   drivers/iio/magnetometer/tmag5273.
  TI TRF7970A NFC DRIVER
  M:    Mark Greer <[email protected]>
  L:    [email protected]
 -L:    [email protected] (subscribers-only)
  S:    Supported
  F:    Documentation/devicetree/bindings/net/nfc/ti,trf7970a.yaml
  F:    drivers/nfc/trf7970a.c
@@@ -21203,6 -21075,7 +21203,6 @@@ F:   Documentation/hwmon/tmp401.rs
  F:    drivers/hwmon/tmp401.c
  
  TMP464 HARDWARE MONITOR DRIVER
 -M:    Agathe Porte <[email protected]>
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -21365,14 -21238,6 +21365,14 @@@ S: Maintaine
  F:    Documentation/tools/rtla/
  F:    tools/tracing/rtla/
  
 +TECHNICAL ADVISORY BOARD PROCESS DOCS
 +M:    "Theodore Ts'o" <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/process/researcher-guidelines.rst
 +F:    Documentation/process/contribution-maturity-model.rst
 +
  TRADITIONAL CHINESE DOCUMENTATION
  M:    Hu Haowen <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -21780,7 -21645,6 +21780,7 @@@ USB OVER IP DRIVE
  M:    Valentina Manea <[email protected]>
  M:    Shuah Khan <[email protected]>
  M:    Shuah Khan <[email protected]>
 +R:    Hongren Zheng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/usb/usbip_protocol.rst
@@@ -21927,7 -21791,7 +21927,7 @@@ USB WIRELESS RNDIS DRIVER (rndis_wlan
  M:    Jussi Kivilinna <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/wireless/rndis_wlan.c
 +F:    drivers/net/wireless/legacy/rndis_wlan.c
  
  USB XHCI DRIVER
  M:    Mathias Nyman <[email protected]>
@@@ -22306,9 -22170,7 +22306,9 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
 +F:    kernel/vhost_task.c
  F:    drivers/vhost/
 +F:    include/linux/sched/vhost_task.h
  F:    include/linux/vhost_iotlb.h
  F:    include/uapi/linux/vhost.h
  
@@@ -22683,7 -22545,7 +22683,7 @@@ F:   drivers/input/misc/wistron_btns.
  WL3501 WIRELESS PCMCIA CARD DRIVER
  L:    [email protected]
  S:    Odd fixes
 -F:    drivers/net/wireless/wl3501*
 +F:    drivers/net/wireless/legacy/wl3501*
  
  WOLFSON MICROELECTRONICS DRIVERS
  L:    [email protected]
@@@ -22782,7 -22644,7 +22782,7 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  F:    Documentation/devicetree/bindings/x86/
 -F:    Documentation/x86/
 +F:    Documentation/arch/x86/
  F:    arch/x86/
  
  X86 ENTRY CODE
@@@ -22792,24 -22654,13 +22792,24 @@@ S:        Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/asm
  F:    arch/x86/entry/
  
 +X86 HARDWARE VULNERABILITIES
 +M:    Thomas Gleixner <[email protected]>
 +M:    Borislav Petkov <[email protected]>
 +M:    Peter Zijlstra <[email protected]>
 +M:    Josh Poimboeuf <[email protected]>
 +R:    Pawan Gupta <[email protected]>
 +S:    Maintained
 +F:    Documentation/admin-guide/hw-vuln/
 +F:    arch/x86/include/asm/nospec-branch.h
 +F:    arch/x86/kernel/cpu/bugs.c
 +
  X86 MCE INFRASTRUCTURE
  M:    Tony Luck <[email protected]>
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-mce
 -F:    Documentation/x86/x86_64/machinecheck.rst
 +F:    Documentation/arch/x86/x86_64/machinecheck.rst
  F:    arch/x86/kernel/cpu/mce/*
  
  X86 MICROCODE UPDATE SUPPORT
@@@ -22831,7 -22682,7 +22831,7 @@@ M:   Hans de Goede <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
 -F:    drivers/platform/x86/x86-android-tablets.c
 +F:    drivers/platform/x86/x86-android-tablets/
  
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <[email protected]>
@@@ -23180,6 -23031,7 +23180,6 @@@ F:   drivers/i2c/busses/i2c-xlp9xx.
  
  XRA1403 GPIO EXPANDER
  M:    Nandor Han <[email protected]>
 -M:    Semi Malinen <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/gpio/gpio-xra1403.txt
@@@ -23187,6 -23039,7 +23187,6 @@@ F:   drivers/gpio/gpio-xra1403.
  
  XTENSA XTFPGA PLATFORM SUPPORT
  M:    Max Filippov <[email protected]>
 -L:    [email protected]
  S:    Maintained
  F:    drivers/spi/spi-xtensa-xtfpga.c
  F:    sound/soc/xtensa/xtfpga-i2s.c
@@@ -23269,7 -23122,7 +23269,7 @@@ S:   Maintaine
  F:    arch/x86/kernel/cpu/zhaoxin.c
  
  ZONEFS FILESYSTEM
 -M:    Damien Le Moal <d[email protected]>
 +M:    Damien Le Moal <d[email protected]>
  M:    Naohiro Aota <[email protected]>
  R:    Johannes Thumshirn <[email protected]>
  L:    [email protected]
@@@ -23337,13 -23190,6 +23337,13 @@@ L: [email protected]
  S:    Maintained
  F:    mm/zswap.c
  
 +NXP BLUETOOTH WIRELESS DRIVERS
 +M:    Amitkumar Karwar <[email protected]>
 +M:    Neeraj Kale <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
 +F:    drivers/bluetooth/btnxpuart.c
 +
  THE REST
  M:    Linus Torvalds <[email protected]>
  L:    [email protected]
diff --combined drivers/net/ieee802154/ca8210.c
index cf12d71e9411a25317eae2f9d0e0d63def1a2a6c,fc60b5d74f6c894dc9ef532cce0239a9dca3a068..0134ebac227abaff6dda124800ef745019549fcc
--- 1/drivers/net/ieee802154/ca8210.c
--- 2/drivers/net/ieee802154/ca8210.c
+++ b/drivers/net/ieee802154/ca8210.c
@@@ -51,7 -51,6 +51,7 @@@
  #include <linux/clk-provider.h>
  #include <linux/debugfs.h>
  #include <linux/delay.h>
 +#include <linux/gpio/consumer.h>
  #include <linux/gpio.h>
  #include <linux/ieee802154.h>
  #include <linux/io.h>
@@@ -1903,9 -1902,10 +1903,9 @@@ static int ca8210_skb_tx
        struct ca8210_priv  *priv
  )
  {
 -      int status;
        struct ieee802154_hdr header = { };
        struct secspec secspec;
 -      unsigned int mac_len;
 +      int mac_len, status;
  
        dev_dbg(&priv->spi->dev, "%s called\n", __func__);
  
@@@ -2855,7 -2855,7 +2855,7 @@@ static int ca8210_interrupt_init(struc
        );
        if (ret) {
                dev_crit(&spi->dev, "request_irq %d failed\n", pdata->irq_id);
 -              gpio_unexport(pdata->gpio_irq);
 +              gpiod_unexport(gpio_to_desc(pdata->gpio_irq));
                gpio_free(pdata->gpio_irq);
        }
  
@@@ -2969,7 -2969,7 +2969,7 @@@ static int ca8210_test_interface_init(s
                sizeof(node_name),
                "ca8210@%d_%d",
                priv->spi->master->bus_num,
-               priv->spi->chip_select
+               spi_get_chipselect(priv->spi, 0)
        );
  
        test->ca8210_dfs_spi_int = debugfs_create_file(
@@@ -3179,7 -3179,8 +3179,7 @@@ MODULE_DEVICE_TABLE(of, ca8210_of_ids)
  static struct spi_driver ca8210_spi_driver = {
        .driver = {
                .name =                 DRIVER_NAME,
 -              .owner =                THIS_MODULE,
 -              .of_match_table =       of_match_ptr(ca8210_of_ids),
 +              .of_match_table =       ca8210_of_ids,
        },
        .probe  =                       ca8210_probe,
        .remove =                       ca8210_remove
diff --combined drivers/platform/x86/serial-multi-instantiate.c
index cd25125b7923ccbd9a608afb7b7f9bf42a69c8e6,270a4700d25d97f5022228e94b1c5513e336f224..f3dcbdd72fec70239dd58057fa12fec0fc4179d9
--- 1/drivers/platform/x86/serial-multi-instantiate.c
--- 2/drivers/platform/x86/serial-multi-instantiate.c
+++ b/drivers/platform/x86/serial-multi-instantiate.c
@@@ -139,7 -139,8 +139,8 @@@ static int smi_spi_probe(struct platfor
                        goto error;
                }
  
-               dev_dbg(dev, "SPI device %s using chip select %u", name, spi_dev->chip_select);
+               dev_dbg(dev, "SPI device %s using chip select %u", name,
+                       spi_get_chipselect(spi_dev, 0));
  
                smi->spi_devs[i] = spi_dev;
                smi->spi_num++;
@@@ -265,11 -266,13 +266,11 @@@ static int smi_probe(struct platform_de
        }
  }
  
 -static int smi_remove(struct platform_device *pdev)
 +static void smi_remove(struct platform_device *pdev)
  {
        struct smi *smi = platform_get_drvdata(pdev);
  
        smi_devs_unregister(smi);
 -
 -      return 0;
  }
  
  static const struct smi_node bsg1160_data = {
@@@ -337,7 -340,7 +338,7 @@@ static struct platform_driver smi_drive
                .acpi_match_table = smi_acpi_ids,
        },
        .probe = smi_probe,
 -      .remove = smi_remove,
 +      .remove_new = smi_remove,
  };
  module_platform_driver(smi_driver);
  
diff --combined drivers/spi/spi-rockchip-sfc.c
index 69347b6bf60cdbd44a5e5a9bac8efa66cac0c0a3,b370aade11b47d42b99778dcc271a1b53f75fad8..583f4187f03035d14918e8874eeb320839318485
--- 1/drivers/spi/spi-rockchip-sfc.c
--- 2/drivers/spi/spi-rockchip-sfc.c
+++ b/drivers/spi/spi-rockchip-sfc.c
@@@ -346,7 -346,7 +346,7 @@@ static int rockchip_sfc_xfer_setup(stru
  
        /* set the Controller */
        ctrl |= SFC_CTRL_PHASE_SEL_NEGETIVE;
-       cmd |= mem->spi->chip_select << SFC_CMD_CS_SHIFT;
+       cmd |= spi_get_chipselect(mem->spi, 0) << SFC_CMD_CS_SHIFT;
  
        dev_dbg(sfc->dev, "sfc addr.nbytes=%x(x%d) dummy.nbytes=%x(x%d)\n",
                op->addr.nbytes, op->addr.buswidth,
@@@ -558,7 -558,6 +558,6 @@@ static int rockchip_sfc_probe(struct pl
  {
        struct device *dev = &pdev->dev;
        struct spi_master *master;
-       struct resource *res;
        struct rockchip_sfc *sfc;
        int ret;
  
@@@ -576,8 -575,7 +575,7 @@@
        sfc = spi_master_get_devdata(master);
        sfc->dev = dev;
  
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       sfc->regbase = devm_ioremap_resource(dev, res);
+       sfc->regbase = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(sfc->regbase))
                return PTR_ERR(sfc->regbase);
  
@@@ -632,7 -630,7 +630,7 @@@
        if (ret) {
                dev_err(dev, "Failed to request irq\n");
  
 -              return ret;
 +              goto err_irq;
        }
  
        ret = rockchip_sfc_init(sfc);
@@@ -656,7 -654,7 +654,7 @@@ err_hclk
        return ret;
  }
  
- static int rockchip_sfc_remove(struct platform_device *pdev)
+ static void rockchip_sfc_remove(struct platform_device *pdev)
  {
        struct spi_master *master = platform_get_drvdata(pdev);
        struct rockchip_sfc *sfc = platform_get_drvdata(pdev);
@@@ -665,8 -663,6 +663,6 @@@
  
        clk_disable_unprepare(sfc->clk);
        clk_disable_unprepare(sfc->hclk);
- 
-       return 0;
  }
  
  static const struct of_device_id rockchip_sfc_dt_ids[] = {
@@@ -681,7 -677,7 +677,7 @@@ static struct platform_driver rockchip_
                .of_match_table = rockchip_sfc_dt_ids,
        },
        .probe  = rockchip_sfc_probe,
-       .remove = rockchip_sfc_remove,
+       .remove_new = rockchip_sfc_remove,
  };
  module_platform_driver(rockchip_sfc_driver);
  
diff --combined drivers/spi/spi.c
index 7bc14fb309a69970ea92902e4f1ec88b32a41e8c,9036d7a50674c3fc8a70c599007f2c5990c6e527..a1ad8f41fb86440c9133d8fa714072d07af418ca
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@ -117,24 -117,28 +117,28 @@@ static struct spi_statistics __percpu *
        return pcpu_stats;
  }
  
- #define spi_pcpu_stats_totalize(ret, in, field)                               \
- do {                                                                  \
-       int i;                                                          \
-       ret = 0;                                                        \
-       for_each_possible_cpu(i) {                                      \
-               const struct spi_statistics *pcpu_stats;                \
-               u64 inc;                                                \
-               unsigned int start;                                     \
-               pcpu_stats = per_cpu_ptr(in, i);                        \
-               do {                                                    \
-                       start = u64_stats_fetch_begin(          \
-                                       &pcpu_stats->syncp);            \
-                       inc = u64_stats_read(&pcpu_stats->field);       \
-               } while (u64_stats_fetch_retry(                 \
-                                       &pcpu_stats->syncp, start));    \
-               ret += inc;                                             \
-       }                                                               \
- } while (0)
+ static ssize_t spi_emit_pcpu_stats(struct spi_statistics __percpu *stat,
+                                  char *buf, size_t offset)
+ {
+       u64 val = 0;
+       int i;
+ 
+       for_each_possible_cpu(i) {
+               const struct spi_statistics *pcpu_stats;
+               u64_stats_t *field;
+               unsigned int start;
+               u64 inc;
+ 
+               pcpu_stats = per_cpu_ptr(stat, i);
+               field = (void *)pcpu_stats + offset;
+               do {
+                       start = u64_stats_fetch_begin(&pcpu_stats->syncp);
+                       inc = u64_stats_read(field);
+               } while (u64_stats_fetch_retry(&pcpu_stats->syncp, start));
+               val += inc;
+       }
+       return sysfs_emit(buf, "%llu\n", val);
+ }
  
  #define SPI_STATISTICS_ATTRS(field, file)                             \
  static ssize_t spi_controller_##field##_show(struct device *dev,      \
@@@ -165,11 -169,8 +169,8 @@@ static struct device_attribute dev_attr
  static ssize_t spi_statistics_##name##_show(struct spi_statistics __percpu *stat, \
                                            char *buf)                  \
  {                                                                     \
-       ssize_t len;                                                    \
-       u64 val;                                                        \
-       spi_pcpu_stats_totalize(val, stat, field);                      \
-       len = sysfs_emit(buf, "%llu\n", val);                           \
-       return len;                                                     \
+       return spi_emit_pcpu_stats(stat, buf,                           \
+                       offsetof(struct spi_statistics, field));        \
  }                                                                     \
  SPI_STATISTICS_ATTRS(name, file)
  
@@@ -2367,8 -2368,8 +2368,8 @@@ of_register_spi_device(struct spi_contr
  
        /* Store a pointer to the node in the device structure */
        of_node_get(nc);
-       spi->dev.of_node = nc;
-       spi->dev.fwnode = of_fwnode_handle(nc);
+ 
+       device_set_node(&spi->dev, of_fwnode_handle(nc));
  
        /* Register the new device */
        rc = spi_add_device(spi);
@@@ -3075,7 -3076,7 +3076,7 @@@ static int spi_controller_check_ops(str
         * If ->mem_ops or ->mem_ops->exec_op is NULL, we request that at least
         * one of the ->transfer_xxx() method be implemented.
         */
-       if (!ctlr->mem_ops || (ctlr->mem_ops && !ctlr->mem_ops->exec_op)) {
+       if (!ctlr->mem_ops || !ctlr->mem_ops->exec_op) {
                if (!ctlr->transfer && !ctlr->transfer_one &&
                   !ctlr->transfer_one_message) {
                        return -EINVAL;
@@@ -3621,6 -3622,55 +3622,55 @@@ int spi_split_transfers_maxsize(struct 
  }
  EXPORT_SYMBOL_GPL(spi_split_transfers_maxsize);
  
+ 
+ /**
+  * spi_split_transfers_maxwords - split spi transfers into multiple transfers
+  *                                when an individual transfer exceeds a
+  *                                certain number of SPI words
+  * @ctlr:     the @spi_controller for this transfer
+  * @msg:      the @spi_message to transform
+  * @maxwords: the number of words to limit each transfer to
+  * @gfp:      GFP allocation flags
+  *
+  * Return: status of transformation
+  */
+ int spi_split_transfers_maxwords(struct spi_controller *ctlr,
+                                struct spi_message *msg,
+                                size_t maxwords,
+                                gfp_t gfp)
+ {
+       struct spi_transfer *xfer;
+ 
+       /*
+        * Iterate over the transfer_list,
+        * but note that xfer is advanced to the last transfer inserted
+        * to avoid checking sizes again unnecessarily (also xfer does
+        * potentially belong to a different list by the time the
+        * replacement has happened).
+        */
+       list_for_each_entry(xfer, &msg->transfers, transfer_list) {
+               size_t maxsize;
+               int ret;
+ 
+               if (xfer->bits_per_word <= 8)
+                       maxsize = maxwords;
+               else if (xfer->bits_per_word <= 16)
+                       maxsize = 2 * maxwords;
+               else
+                       maxsize = 4 * maxwords;
+ 
+               if (xfer->len > maxsize) {
+                       ret = __spi_split_transfer_maxsize(ctlr, msg, &xfer,
+                                                          maxsize, gfp);
+                       if (ret)
+                               return ret;
+               }
+       }
+ 
+       return 0;
+ }
+ EXPORT_SYMBOL_GPL(spi_split_transfers_maxwords);
+ 
  /*-------------------------------------------------------------------------*/
  
  /* Core methods for SPI controller protocol drivers.  Some of the
@@@ -4456,11 -4506,6 +4506,11 @@@ static int of_spi_notify(struct notifie
                        return NOTIFY_OK;
                }
  
 +              /*
 +               * Clear the flag before adding the device so that fw_devlink
 +               * doesn't skip adding consumers to this device.
 +               */
 +              rd->dn->fwnode.flags &= ~FWNODE_FLAG_NOT_DEVICE;
                spi = of_register_spi_device(ctlr, rd->dn);
                put_device(&ctlr->dev);
  
Empty description
This page took 0.258865 seconds and 4 git commands to generate.