projects / linux-2.6-microblaze.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: d656005 eec262d)
Merge tag 'spi-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Feb 2021 17:19:08 +0000 (09:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Feb 2021 17:19:08 +0000 (09:19 -0800)
Pull spi updates from Mark Brown:
 "The main focus of this release from a framework point of view has been
  spi-mem where we've acquired support for a few new hardware features
  which enable better performance on suitable hardware.

  Otherwise mostly thanks to Arnd's cleanup efforts on old platforms
  we've removed several obsolete drivers which just about balance out
  the newer drivers we've added this cycle.

  Summary:

   - Allow drivers to flag if they are unidirectional.

   - Support for DTR mode and hardware acceleration of dummy cycles in
     spi-mem.

   - Support for Allwinder H616, Intel Lightning Mountain, nVidia Tegra
     QuadSPI, Realtek RTL838x and RTL839x.

   - Removal of obsolete EFM32, Txx9 and SIRF Prima and Atlas drivers"

* tag 'spi-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (76 commits)
  spi: Skip zero-length transfers in spi_transfer_one_message()
  spi: dw: Avoid stack content exposure
  spi: cadence-quadspi: Use spi_mem_dtr_supports_op()
  spi: spi-mem: add spi_mem_dtr_supports_op()
  spi: atmel-quadspi: Disable the QSPI IP at suspend()
  spi: pxa2xx: Add IDs for the controllers found on Intel Lynxpoint
  spi: pxa2xx: Fix the controller numbering for Wildcat Point
  spi: Change provied to provided in the file spi.h
  spi: mediatek: add set_cs_timing support
  spi: support CS timing for HW & SW mode
  spi: add power control when set_cs_timing
  spi: stm32: make spurious and overrun interrupts visible
  spi: stm32h7: replace private SPI_1HZ_NS with NSEC_PER_SEC
  spi: stm32: defer probe for reset
  spi: stm32: driver uses reset controller only at init
  spi: stm32h7: ensure message are smaller than max size
  spi: stm32: use bitfield macros
  spi: stm32: do not mandate cs_gpio
  spi: stm32: properly handle 0 byte transfer
  spi: clps711xx: remove redundant white-space
  ...

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/spi/Kconfig patch | diff1 | diff2 | blob | history
drivers/spi/spi.c patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index 7beba83,f9d462c..555c944
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -699,8 -699,7 +699,8 @@@ M: Michael Tretter <m.tretter@pengutron
  R:    Pengutronix Kernel Team <kernel@pengutronix.de>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/staging/media/allegro-dvt/
 +F:    Documentation/devicetree/bindings/media/allegro,al5e.yaml
 +F:    drivers/media/platform/allegro-dvt/
  
  ALLWINNER A10 CSI DRIVER
  M:    Maxime Ripard <mripard@kernel.org>
@@@ -1414,6 -1413,7 +1414,6 @@@ F:      arch/arm*/include/asm/hw_breakpoint.
  F:    arch/arm*/include/asm/perf_event.h
  F:    arch/arm*/kernel/hw_breakpoint.c
  F:    arch/arm*/kernel/perf_*
 -F:    arch/arm/oprofile/common.c
  F:    drivers/perf/
  F:    include/linux/perf/arm_pmu.h
  
@@@ -1511,7 -1511,6 +1511,7 @@@ ARM/ACTIONS SEMI ARCHITECTUR
  M:    Andreas Färber <afaerber@suse.de>
  M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-actions@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/actions.yaml
  F:    Documentation/devicetree/bindings/clock/actions,owl-cmu.txt
@@@ -1779,6 -1778,19 +1779,6 @@@ F:     drivers/net/ethernet/cortina
  F:    drivers/pinctrl/pinctrl-gemini.c
  F:    drivers/rtc/rtc-ftrtc010.c
  
 -ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
 -M:    Barry Song <baohua@kernel.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
 -F:    arch/arm/boot/dts/prima2*
 -F:    arch/arm/mach-prima2/
 -F:    drivers/clk/sirf/
 -F:    drivers/clocksource/timer-atlas7.c
 -F:    drivers/clocksource/timer-prima2.c
 -X:    drivers/gnss
 -N:    [^a-z]sirf
 -
  ARM/CZ.NIC TURRIS MOX SUPPORT
  M:    Marek Behun <marek.behun@nic.cz>
  S:    Maintained
@@@ -1794,6 -1806,13 +1794,6 @@@ F:     drivers/firmware/turris-mox-rwtm.
  F:    drivers/gpio/gpio-moxtet.c
  F:    include/linux/moxtet.h
  
 -ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 -M:    Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 -R:    Pengutronix Kernel Team <kernel@pengutronix.de>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -N:    efm32
 -
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  M:    Robert Jarzmik <robert.jarzmik@free.fr>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2071,7 -2090,7 +2071,7 @@@ M:      Chunfeng Yun <chunfeng.yun@mediatek.
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    Documentation/devicetree/bindings/phy/phy-mtk-*
 +F:    Documentation/devicetree/bindings/phy/mediatek,*
  F:    drivers/phy/mediatek/
  
  ARM/Microchip (AT91) SoC support
@@@ -2136,7 -2155,7 +2136,7 @@@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPOR
  M:    Michael Petchkovsky <mkpetch@internode.on.net>
  S:    Maintained
  
 -ARM/NOMADIK/U300/Ux500 ARCHITECTURES
 +ARM/NOMADIK/Ux500 ARCHITECTURES
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -2145,23 -2164,35 +2145,23 @@@ F:   Documentation/devicetree/bindings/ar
  F:    Documentation/devicetree/bindings/arm/ux500.yaml
  F:    Documentation/devicetree/bindings/arm/ux500/
  F:    Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-stu300.txt
  F:    arch/arm/boot/dts/ste-*
  F:    arch/arm/mach-nomadik/
 -F:    arch/arm/mach-u300/
  F:    arch/arm/mach-ux500/
  F:    drivers/clk/clk-nomadik.c
 -F:    drivers/clk/clk-u300.c
  F:    drivers/clocksource/clksrc-dbx500-prcmu.c
 -F:    drivers/clocksource/timer-u300.c
 -F:    drivers/dma/coh901318*
  F:    drivers/dma/ste_dma40*
  F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/i2c/busses/i2c-nomadik.c
 -F:    drivers/i2c/busses/i2c-stu300.c
  F:    drivers/iio/adc/ab8500-gpadc.c
 -F:    drivers/mfd/ab3100*
  F:    drivers/mfd/ab8500*
  F:    drivers/mfd/abx500*
  F:    drivers/mfd/db8500*
  F:    drivers/mfd/dbx500*
  F:    drivers/pinctrl/nomadik/
 -F:    drivers/pinctrl/pinctrl-coh901*
 -F:    drivers/pinctrl/pinctrl-u300.c
 -F:    drivers/rtc/rtc-ab3100.c
  F:    drivers/rtc/rtc-ab8500.c
 -F:    drivers/rtc/rtc-coh901331.c
  F:    drivers/rtc/rtc-pl031.c
  F:    drivers/soc/ux500/
 -F:    drivers/watchdog/coh901327_wdt.c
  
  ARM/NUVOTON NPCM ARCHITECTURE
  M:    Avi Fishman <avifishman70@gmail.com>
@@@ -2383,8 -2414,6 +2383,8 @@@ F:      drivers/*/*s5pv210
  F:    drivers/memory/samsung/
  F:    drivers/soc/samsung/
  F:    drivers/tty/serial/samsung*
 +F:    include/linux/platform_data/*s3c*
 +F:    include/linux/serial_s3c.h
  F:    include/linux/soc/samsung/
  N:    exynos
  N:    s3c2410
@@@ -2528,6 -2557,13 +2528,6 @@@ F:     arch/arm/boot/dts/berlin
  F:    arch/arm/mach-berlin/
  F:    arch/arm64/boot/dts/synaptics/
  
 -ARM/TANGO ARCHITECTURE
 -M:    Marc Gonzalez <marc.w.gonzalez@free.fr>
 -M:    Mans Rullgard <mans@mansr.com>
 -L:    linux-arm-kernel@lists.infradead.org
 -S:    Odd Fixes
 -N:    tango
 -
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2605,13 -2641,9 +2605,13 @@@ L:    linux-arm-kernel@lists.infradead.or
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git
  F:    Documentation/devicetree/bindings/arm/toshiba.yaml
 +F:    Documentation/devicetree/bindings/net/toshiba,visconti-dwmac.yaml
  F:    Documentation/devicetree/bindings/pinctrl/toshiba,tmpv7700-pinctrl.yaml
 +F:    Documentation/devicetree/bindings/watchdog/toshiba,visconti-wdt.yaml
  F:    arch/arm64/boot/dts/toshiba/
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
  F:    drivers/pinctrl/visconti/
 +F:    drivers/watchdog/visconti_wdt.c
  N:    visconti
  
  ARM/UNIPHIER ARCHITECTURE
@@@ -2691,6 -2723,40 +2691,6 @@@ S:     Maintaine
  F:    arch/arm/mach-pxa/include/mach/z2.h
  F:    arch/arm/mach-pxa/z2.c
  
 -ARM/ZTE ARCHITECTURE
 -M:    Jun Nie <jun.nie@linaro.org>
 -M:    Shawn Guo <shawnguo@kernel.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/arm/zte.yaml
 -F:    Documentation/devicetree/bindings/clock/zx2967*.txt
 -F:    Documentation/devicetree/bindings/dma/zxdma.txt
 -F:    Documentation/devicetree/bindings/gpio/zx296702-gpio.txt
 -F:    Documentation/devicetree/bindings/i2c/i2c-zx2967.txt
 -F:    Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
 -F:    Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt
 -F:    Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt
 -F:    Documentation/devicetree/bindings/soc/zte/
 -F:    Documentation/devicetree/bindings/sound/zte,*.txt
 -F:    Documentation/devicetree/bindings/thermal/zx2967-thermal.txt
 -F:    Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt
 -F:    arch/arm/boot/dts/zx2967*
 -F:    arch/arm/mach-zx/
 -F:    arch/arm64/boot/dts/zte/
 -F:    drivers/clk/zte/
 -F:    drivers/dma/zx_dma.c
 -F:    drivers/gpio/gpio-zx.c
 -F:    drivers/i2c/busses/i2c-zx2967.c
 -F:    drivers/mmc/host/dw_mmc-zx.*
 -F:    drivers/pinctrl/zte/
 -F:    drivers/soc/zte/
 -F:    drivers/thermal/zx2967_thermal.c
 -F:    drivers/watchdog/zx2967_wdt.c
 -F:    include/dt-bindings/clock/zx2967*.h
 -F:    include/dt-bindings/soc/zte,*.h
 -F:    sound/soc/codecs/zx_aud96p22.c
 -F:    sound/soc/zte/
 -
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <michal.simek@xilinx.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2699,7 -2765,6 +2699,7 @@@ W:      http://wiki.xilinx.co
  T:    git https://github.com/Xilinx/linux-xlnx.git
  F:    Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml
  F:    Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml
 +F:    Documentation/devicetree/bindings/spi/xlnx,zynq-qspi.yaml
  F:    arch/arm/mach-zynq/
  F:    drivers/block/xsysace.c
  F:    drivers/clocksource/timer-cadence-ttc.c
@@@ -2722,14 -2787,6 +2722,14 @@@ F:    arch/arm64
  F:    tools/testing/selftests/arm64/
  X:    arch/arm64/boot/dts/
  
 +ARROW SPEEDCHIPS XRS7000 SERIES ETHERNET SWITCH DRIVER
 +M:    George McCollister <george.mccollister@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml
 +F:    drivers/net/dsa/xrs700x/*
 +F:    net/dsa/tag_xrs700x.c
 +
  AS3645A LED FLASH CONTROLLER DRIVER
  M:    Sakari Ailus <sakari.ailus@iki.fi>
  L:    linux-leds@vger.kernel.org
@@@ -2775,15 -2832,6 +2775,15 @@@ F:    Documentation/devicetree/bindings/in
  F:    drivers/irqchip/irq-aspeed-scu-ic.c
  F:    include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
  
 +ASPEED SD/MMC DRIVER
 +M:    Andrew Jeffery <andrew@aj.id.au>
 +L:    linux-aspeed@lists.ozlabs.org (moderated for non-subscribers)
 +L:    openbmc@lists.ozlabs.org (moderated for non-subscribers)
 +L:    linux-mmc@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml
 +F:    drivers/mmc/host/sdhci-of-aspeed*
 +
  ASPEED VIDEO ENGINE DRIVER
  M:    Eddie James <eajames@linux.ibm.com>
  L:    linux-media@vger.kernel.org
@@@ -3351,7 -3399,6 +3351,7 @@@ L:      openwrt-devel@lists.openwrt.org (sub
  S:    Supported
  F:    Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
  F:    drivers/net/dsa/b53/*
 +F:    include/linux/dsa/brcm.h
  F:    include/linux/platform_data/b53.h
  
  BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
@@@ -3389,15 -3436,6 +3389,15 @@@ F:    Documentation/devicetree/bindings/mi
  F:    arch/mips/bcm47xx/*
  F:    arch/mips/include/asm/mach-bcm47xx/*
  
 +BROADCOM BCM4908 ETHERNET DRIVER
 +M:    Rafał Miłecki <rafal@milecki.pl>
 +M:    bcm-kernel-feedback-list@broadcom.com
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml
 +F:    drivers/net/ethernet/broadcom/bcm4908_enet.*
 +F:    drivers/net/ethernet/broadcom/unimac.h
 +
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:    Hauke Mehrtens <hauke@hauke-m.de>
  M:    Rafał Miłecki <zajec5@gmail.com>
@@@ -3586,7 -3624,6 +3586,7 @@@ S:      Supporte
  F:    Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
  F:    Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
  F:    drivers/net/ethernet/broadcom/genet/
 +F:    drivers/net/ethernet/broadcom/unimac.h
  F:    drivers/net/mdio/mdio-bcm-unimac.c
  F:    include/linux/platform_data/bcmgenet.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
@@@ -3620,15 -3657,6 +3620,15 @@@ N:    bcm8831
  N:    hr2
  N:    stingray
  
 +BROADCOM IPROC GBIT ETHERNET DRIVER
 +M:    Rafał Miłecki <rafal@milecki.pl>
 +M:    bcm-kernel-feedback-list@broadcom.com
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/brcm,amac.txt
 +F:    drivers/net/ethernet/broadcom/bgmac*
 +F:    drivers/net/ethernet/broadcom/unimac.h
 +
  BROADCOM KONA GPIO DRIVER
  M:    Ray Jui <rjui@broadcom.com>
  L:    bcm-kernel-feedback-list@broadcom.com
@@@ -3654,16 -3682,6 +3654,16 @@@ L:    linux-mips@vger.kernel.or
  S:    Maintained
  F:    drivers/firmware/broadcom/*
  
 +BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER
 +M:    Rafał Miłecki <rafal@milecki.pl>
 +M:    Florian Fainelli <f.fainelli@gmail.com>
 +M:    bcm-kernel-feedback-list@broadcom.com
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +T:    git git://github.com/broadcom/stblinux.git
 +F:    drivers/soc/bcm/bcm-pmb.c
 +F:    include/dt-bindings/soc/bcm-pmb.h
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <zajec5@gmail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -3718,7 -3736,6 +3718,7 @@@ L:      bcm-kernel-feedback-list@broadcom.co
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bcmsysport.*
 +F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Siva Reddy Kallam <siva.kallam@broadcom.com>
@@@ -3826,6 -3843,14 +3826,6 @@@ F:     drivers/irqchip/irq-csky-
  N:    csky
  K:    csky
  
 -C6X ARCHITECTURE
 -M:    Mark Salter <msalter@redhat.com>
 -M:    Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
 -L:    linux-c6x-dev@linux-c6x.org
 -S:    Maintained
 -W:    http://www.linux-c6x.org/wiki/index.php/Main_Page
 -F:    arch/c6x/
 -
  CA8210 IEEE-802.15.4 RADIO DRIVER
  M:    Harry Morris <h.morris@cascoda.com>
  L:    linux-wpan@vger.kernel.org
@@@ -3864,15 -3889,6 +3864,15 @@@ S:    Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
  F:    Documentation/devicetree/bindings/usb/cdns,usb3.yaml
  F:    drivers/usb/cdns3/
 +X:    drivers/usb/cdns3/cdnsp*
 +
 +CADENCE USBSSP DRD IP DRIVER
 +M:    Pawel Laszczak <pawell@cadence.com>
 +L:    linux-usb@vger.kernel.org
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
 +F:    drivers/usb/cdns3/
 +X:    drivers/usb/cdns3/cdns3*
  
  CADET FM/AM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
@@@ -3914,10 -3930,8 +3914,10 @@@ T:    git git://git.kernel.org/pub/scm/lin
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/devicetree/bindings/net/can/
  F:    drivers/net/can/
 +F:    include/linux/can/bittiming.h
  F:    include/linux/can/dev.h
  F:    include/linux/can/led.h
 +F:    include/linux/can/length.h
  F:    include/linux/can/platform/
  F:    include/linux/can/rx-offload.h
  F:    include/uapi/linux/can/error.h
@@@ -3933,7 -3947,6 +3933,7 @@@ W:      https://github.com/linux-ca
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  F:    Documentation/networking/can.rst
 +F:    include/linux/can/can-ml.h
  F:    include/linux/can/core.h
  F:    include/linux/can/skb.h
  F:    include/net/netns/can.h
@@@ -4069,6 -4082,7 +4069,6 @@@ W:      http://www.ibm.com/developerworks/po
  F:    arch/powerpc/include/asm/cell*.h
  F:    arch/powerpc/include/asm/spu*.h
  F:    arch/powerpc/include/uapi/asm/spu*.h
 -F:    arch/powerpc/oprofile/*cell*
  F:    arch/powerpc/platforms/cell/
  
  CELLWISE CW2015 BATTERY DRIVER
@@@ -4454,7 -4468,7 +4454,7 @@@ F:      include/linux/console
  
  CONTROL GROUP (CGROUP)
  M:    Tejun Heo <tj@kernel.org>
 -M:    Li Zefan <lizefan@huawei.com>
 +M:    Zefan Li <lizefan.x@bytedance.com>
  M:    Johannes Weiner <hannes@cmpxchg.org>
  L:    cgroups@vger.kernel.org
  S:    Maintained
@@@ -4478,9 -4492,11 +4478,9 @@@ F:     block/blk-throttle.
  F:    include/linux/blk-cgroup.h
  
  CONTROL GROUP - CPUSET
 -M:    Li Zefan <lizefan@huawei.com>
 +M:    Zefan Li <lizefan.x@bytedance.com>
  L:    cgroups@vger.kernel.org
  S:    Maintained
 -W:    http://www.bullopensource.org/cpuset/
 -W:    http://oss.sgi.com/projects/cpusets/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  F:    Documentation/admin-guide/cgroup-v1/cpusets.rst
  F:    include/linux/cpuset.h
@@@ -4608,7 -4624,6 +4608,7 @@@ L:      linux-samsung-soc@vger.kernel.or
  S:    Supported
  F:    arch/arm/mach-exynos/pm.c
  F:    drivers/cpuidle/cpuidle-exynos.c
 +F:    include/linux/platform_data/cpuidle-exynos.h
  
  CPUIDLE DRIVER - ARM PSCI
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
@@@ -4924,7 -4939,7 +4924,7 @@@ F:      Documentation/networking/decnet.rs
  F:    net/decnet/
  
  DECSTATION PLATFORM SUPPORT
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  L:    linux-mips@vger.kernel.org
  S:    Maintained
  W:    http://www.linux-mips.org/wiki/DECstation
@@@ -4933,12 -4948,12 +4933,12 @@@ F:   arch/mips/include/asm/dec
  F:    arch/mips/include/asm/mach-dec/
  
  DEFXX FDDI NETWORK DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/net/fddi/defxx.*
  
  DEFZA FDDI NETWORK DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/net/fddi/defza.*
  
@@@ -4955,17 -4970,17 +4955,17 @@@ M:   Matthew Garrett <mjg59@srcf.ucam.org
  M:    Pali Rohár <pali@kernel.org>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/dell-laptop.c
 +F:    drivers/platform/x86/dell/dell-laptop.c
  
  DELL LAPTOP FREEFALL DRIVER
  M:    Pali Rohár <pali@kernel.org>
  S:    Maintained
 -F:    drivers/platform/x86/dell-smo8800.c
 +F:    drivers/platform/x86/dell/dell-smo8800.c
  
  DELL LAPTOP RBTN DRIVER
  M:    Pali Rohár <pali@kernel.org>
  S:    Maintained
 -F:    drivers/platform/x86/dell-rbtn.*
 +F:    drivers/platform/x86/dell/dell-rbtn.*
  
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <pali@kernel.org>
@@@ -4977,26 -4992,26 +4977,26 @@@ DELL REMOTE BIOS UPDATE DRIVE
  M:    Stuart Hayes <stuart.w.hayes@gmail.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/dell_rbu.c
 +F:    drivers/platform/x86/dell/dell_rbu.c
  
  DELL SMBIOS DRIVER
  M:    Pali Rohár <pali@kernel.org>
  M:    Mario Limonciello <mario.limonciello@dell.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/dell-smbios.*
 +F:    drivers/platform/x86/dell/dell-smbios.*
  
  DELL SMBIOS SMM DRIVER
  M:    Mario Limonciello <mario.limonciello@dell.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/dell-smbios-smm.c
 +F:    drivers/platform/x86/dell/dell-smbios-smm.c
  
  DELL SMBIOS WMI DRIVER
  M:    Mario Limonciello <mario.limonciello@dell.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/dell-smbios-wmi.c
 +F:    drivers/platform/x86/dell/dell-smbios-wmi.c
  F:    tools/wmi/dell-smbios-example.c
  
  DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
@@@ -5004,12 -5019,12 +5004,12 @@@ M:   Stuart Hayes <stuart.w.hayes@gmail.c
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    Documentation/driver-api/dcdbas.rst
 -F:    drivers/platform/x86/dcdbas.*
 +F:    drivers/platform/x86/dell/dcdbas.*
  
  DELL WMI DESCRIPTOR DRIVER
  M:    Mario Limonciello <mario.limonciello@dell.com>
  S:    Maintained
 -F:    drivers/platform/x86/dell-wmi-descriptor.c
 +F:    drivers/platform/x86/dell/dell-wmi-descriptor.c
  
  DELL WMI SYSMAN DRIVER
  M:    Divya Bharathi <divya.bharathi@dell.com>
@@@ -5018,13 -5033,13 +5018,13 @@@ M:   Prasanth Ksr <prasanth.ksr@dell.com
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-class-firmware-attributes
 -F:    drivers/platform/x86/dell-wmi-sysman/
 +F:    drivers/platform/x86/dell/dell-wmi-sysman/
  
  DELL WMI NOTIFICATIONS DRIVER
  M:    Matthew Garrett <mjg59@srcf.ucam.org>
  M:    Pali Rohár <pali@kernel.org>
  S:    Maintained
 -F:    drivers/platform/x86/dell-wmi.c
 +F:    drivers/platform/x86/dell/dell-wmi.c
  
  DELTA ST MEDIA DRIVER
  M:    Hugues Fruchet <hugues.fruchet@st.com>
@@@ -5769,7 -5784,6 +5769,7 @@@ F:      drivers/gpu/drm/vboxvideo
  DRM DRIVER FOR VMWARE VIRTUAL GPU
  M:    "VMware Graphics" <linux-graphics-maintainer@vmware.com>
  M:    Roland Scheidegger <sroland@vmware.com>
 +M:    Zack Rusin <zackr@vmware.com>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  T:    git git://people.freedesktop.org/~sroland/linux
@@@ -5971,8 -5985,8 +5971,8 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/stm
  
  DRM DRIVERS FOR TI KEYSTONE
 -M:    Jyri Sarha <jsarha@ti.com>
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 +M:    Jyri Sarha <jyri.sarha@iki.fi>
 +M:    Tomi Valkeinen <tomba@kernel.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -5982,15 -5996,15 +5982,15 @@@ F:   Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/tidss/
  
  DRM DRIVERS FOR TI LCDC
 -M:    Jyri Sarha <jsarha@ti.com>
 -R:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 +M:    Jyri Sarha <jyri.sarha@iki.fi>
 +R:    Tomi Valkeinen <tomba@kernel.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/tilcdc/
  F:    drivers/gpu/drm/tilcdc/
  
  DRM DRIVERS FOR TI OMAP
 -M:    Tomi Valkeinen <tomi.valkeinen@ti.com>
 +M:    Tomi Valkeinen <tomba@kernel.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/ti/
@@@ -6043,6 -6057,14 +6043,6 @@@ T:     git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/xlnx/
  F:    drivers/gpu/drm/xlnx/
  
 -DRM DRIVERS FOR ZTE ZX
 -M:    Shawn Guo <shawnguo@kernel.org>
 -L:    dri-devel@lists.freedesktop.org
 -S:    Maintained
 -T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/zte,vou.txt
 -F:    drivers/gpu/drm/zte/
 -
  DRM PANEL DRIVERS
  M:    Thierry Reding <thierry.reding@gmail.com>
  R:    Sam Ravnborg <sam@ravnborg.org>
@@@ -6202,7 -6224,7 +6202,7 @@@ F:      include/linux/dim.
  F:    lib/dim/
  
  DZ DECSTATION DZ11 SERIAL DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/tty/serial/dz.*
  
@@@ -6841,9 -6863,6 +6841,9 @@@ F:      include/linux/fs.
  F:    include/linux/fs_types.h
  F:    include/uapi/linux/fs.h
  F:    include/uapi/linux/openat2.h
 +X:    fs/io-wq.c
 +X:    fs/io-wq.h
 +X:    fs/io_uring.c
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    Riku Voipio <riku.voipio@iki.fi>
@@@ -8917,6 -8936,7 +8917,6 @@@ L:      linux-gpio@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-ich.c
 -F:    drivers/gpio/gpio-intel-mid.c
  F:    drivers/gpio/gpio-merrifield.c
  F:    drivers/gpio/gpio-ml-ioh.c
  F:    drivers/gpio/gpio-pch.c
@@@ -8989,11 -9009,9 +8989,11 @@@ INTEL IPU3 CSI-2 CIO2 DRIVE
  M:    Yong Zhi <yong.zhi@intel.com>
  M:    Sakari Ailus <sakari.ailus@linux.intel.com>
  M:    Bingbu Cao <bingbu.cao@intel.com>
 +M:    Dan Scally <djrscally@gmail.com>
  R:    Tianshu Qiu <tian.shu.qiu@intel.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
  F:    drivers/media/pci/intel/ipu3/
  
@@@ -9040,17 -9058,6 +9040,17 @@@ F:    drivers/crypto/keembay/keembay-ocs-a
  F:    drivers/crypto/keembay/ocs-aes.c
  F:    drivers/crypto/keembay/ocs-aes.h
  
 +INTEL KEEM BAY OCS HCU CRYPTO DRIVER
 +M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 +M:    Declan Murphy <declan.murphy@intel.com>
 +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
 +
  INTEL MANAGEMENT ENGINE (mei)
  M:    Tomas Winkler <tomas.winkler@intel.com>
  L:    linux-kernel@vger.kernel.org
@@@ -9088,6 -9095,7 +9088,6 @@@ M:      Andy Shevchenko <andy@kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
  F:    drivers/gpio/gpio-*cove.c
 -F:    drivers/gpio/gpio-msic.c
  
  INTEL PMIC MULTIFUNCTION DEVICE DRIVERS
  M:    Andy Shevchenko <andy@kernel.org>
@@@ -9216,11 -9224,10 +9216,11 @@@ F:   include/linux/tboot.
  
  INTEL SGX
  M:    Jarkko Sakkinen <jarkko@kernel.org>
 +R:    Dave Hansen <dave.hansen@linux.intel.com>
  L:    linux-sgx@vger.kernel.org
  S:    Supported
  Q:    https://patchwork.kernel.org/project/intel-sgx/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-sgx.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
  F:    Documentation/x86/sgx.rst
  F:    arch/x86/entry/vdso/vsgx.S
  F:    arch/x86/include/uapi/asm/sgx.h
@@@ -9288,7 -9295,6 +9288,7 @@@ F:      include/uapi/linux/iommu.
  
  IO_URING
  M:    Jens Axboe <axboe@kernel.dk>
 +R:    Pavel Begunkov <asml.silence@gmail.com>
  L:    io-uring@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.dk/linux-block
@@@ -9296,7 -9302,6 +9296,7 @@@ T:      git git://git.kernel.dk/liburin
  F:    fs/io-wq.c
  F:    fs/io-wq.h
  F:    fs/io_uring.c
 +F:    include/linux/io_uring.h
  F:    include/uapi/linux/io_uring.h
  
  IPMI SUBSYSTEM
@@@ -9554,18 -9559,16 +9554,18 @@@ F:   Documentation/hwmon/k8temp.rs
  F:    drivers/hwmon/k8temp.c
  
  KASAN
 -M:    Andrey Ryabinin <aryabinin@virtuozzo.com>
 +M:    Andrey Ryabinin <ryabinin.a.a@gmail.com>
  R:    Alexander Potapenko <glider@google.com>
 +R:    Andrey Konovalov <andreyknvl@gmail.com>
  R:    Dmitry Vyukov <dvyukov@google.com>
  L:    kasan-dev@googlegroups.com
  S:    Maintained
  F:    Documentation/dev-tools/kasan.rst
 -F:    arch/*/include/asm/kasan.h
 +F:    arch/*/include/asm/*kasan.h
  F:    arch/*/mm/kasan_init*
  F:    include/linux/kasan*.h
 -F:    lib/test_kasan.c
 +F:    lib/Kconfig.kasan
 +F:    lib/test_kasan*.c
  F:    mm/kasan/
  F:    scripts/Makefile.kasan
  
@@@ -9580,7 -9583,7 +9580,7 @@@ F:      scripts/kconfig
  
  KCOV
  R:    Dmitry Vyukov <dvyukov@google.com>
 -R:    Andrey Konovalov <andreyknvl@google.com>
 +R:    Andrey Konovalov <andreyknvl@gmail.com>
  L:    kasan-dev@googlegroups.com
  S:    Maintained
  F:    Documentation/dev-tools/kcov.rst
@@@ -9731,7 -9734,6 +9731,7 @@@ M:      Aleksandar Markovic <aleksandar.qemu
  L:    linux-mips@vger.kernel.org
  L:    kvm@vger.kernel.org
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
  F:    arch/mips/include/asm/kvm*
  F:    arch/mips/include/uapi/asm/kvm*
  F:    arch/mips/kvm/
@@@ -10365,8 -10367,6 +10365,8 @@@ LOCKING PRIMITIVE
  M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Will Deacon <will@kernel.org>
 +R:    Waiman Long <longman@redhat.com>
 +R:    Boqun Feng <boqun.feng@gmail.com> (LOCKDEP)
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
@@@ -10687,8 -10687,6 +10687,8 @@@ M:   Sunil Goutham <sgoutham@marvell.com
  M:    Linu Cherian <lcherian@marvell.com>
  M:    Geetha sowjanya <gakula@marvell.com>
  M:    Jerin Jacob <jerinj@marvell.com>
 +M:    hariprasad <hkelam@marvell.com>
 +M:    Subbaraya Sundeep <sbhatta@marvell.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    Documentation/networking/device_drivers/ethernet/marvell/octeontx2.rst
@@@ -11267,8 -11265,6 +11267,8 @@@ L:   linux-usb@vger.kernel.or
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-mediatek@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/usb/mediatek,*
 +F:    drivers/usb/host/xhci-mtk*
  F:    drivers/usb/mtu3/
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
@@@ -11550,7 -11546,7 +11550,7 @@@ L:   linux-amlogic@lists.infradead.or
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
 -F:    drivers/media/meson/ge2d/
 +F:    drivers/media/platform/meson/ge2d/
  
  MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
  M:    Liang Yang <liang.yang@amlogic.com>
@@@ -11688,9 -11684,9 +11688,9 @@@ F:   drivers/video/fbdev/atmel_lcdfb.
  F:    include/video/atmel_lcdc.h
  
  MICROCHIP MCP16502 PMIC DRIVER
 -M:    Andrei Stefanescu <andrei.stefanescu@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 +S:    Supported
  F:    Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
  F:    drivers/regulator/mcp16502.c
  
@@@ -11805,31 -11801,12 +11805,31 @@@ S:        Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/surface/
  
 +MICROSOFT SURFACE HOT-PLUG DRIVER
 +M:    Maximilian Luz <luzmaximilian@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/surface/surface_hotplug.c
 +
  MICROSOFT SURFACE PRO 3 BUTTON DRIVER
  M:    Chen Yu <yu.c.chen@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Supported
  F:    drivers/platform/surface/surfacepro3_button.c
  
 +MICROSOFT SURFACE SYSTEM AGGREGATOR SUBSYSTEM
 +M:    Maximilian Luz <luzmaximilian@gmail.com>
 +S:    Maintained
 +W:    https://github.com/linux-surface/surface-aggregator-module
 +C:    irc://chat.freenode.net/##linux-surface
 +F:    Documentation/driver-api/surface_aggregator/
 +F:    drivers/platform/surface/aggregator/
 +F:    drivers/platform/surface/surface_acpi_notify.c
 +F:    drivers/platform/surface/surface_aggregator_cdev.c
 +F:    include/linux/surface_acpi_notify.h
 +F:    include/linux/surface_aggregator/
 +F:    include/uapi/linux/surface_aggregator/
 +
  MICROTEK X6 SCANNER
  M:    Oliver Neukum <oliver@neukum.org>
  S:    Maintained
@@@ -11852,11 -11829,9 +11852,11 @@@ L: linux-media@vger.kernel.or
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
  F:    Documentation/driver-api/media/drivers/ccs/
 +F:    Documentation/userspace-api/media/drivers/ccs.rst
  F:    drivers/media/i2c/ccs-pll.c
  F:    drivers/media/i2c/ccs-pll.h
  F:    drivers/media/i2c/ccs/
 +F:    include/uapi/linux/ccs.h
  F:    include/uapi/linux/smiapp.h
  
  MIPS
@@@ -11922,7 -11897,8 +11922,7 @@@ L:   linux-mips@vger.kernel.or
  S:    Maintained
  F:    arch/mips/include/asm/mach-loongson2ef/
  F:    arch/mips/loongson2ef/
 -F:    drivers/*/*/*loongson2*
 -F:    drivers/*/*loongson2*
 +F:    drivers/cpufreq/loongson2_cpufreq.c
  
  MIPS/LOONGSON64 ARCHITECTURE
  M:    Huacai Chen <chenhuacai@kernel.org>
@@@ -11931,6 -11907,8 +11931,6 @@@ L:   linux-mips@vger.kernel.or
  S:    Maintained
  F:    arch/mips/include/asm/mach-loongson64/
  F:    arch/mips/loongson64/
 -F:    drivers/*/*/*loongson3*
 -F:    drivers/*/*loongson3*
  F:    drivers/irqchip/irq-loongson*
  F:    drivers/platform/mips/cpu_hwmon.c
  
@@@ -12539,14 -12517,6 +12539,14 @@@ F: include/net/nfc
  F:    include/uapi/linux/nfc.h
  F:    net/nfc/
  
 +NFC VIRTUAL NCI DEVICE DRIVER
 +M:    Bongsu Jeon <bongsu.jeon@samsung.com>
 +L:    netdev@vger.kernel.org
 +L:    linux-nfc@lists.01.org (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/nfc/virtual_ncidev.c
 +F:    tools/testing/selftests/nci/
 +
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <trond.myklebust@hammerspace.com>
  M:    Anna Schumaker <anna.schumaker@netapp.com>
@@@ -12858,7 -12828,6 +12858,7 @@@ F:   drivers/net/dsa/ocelot/
  F:    drivers/net/ethernet/mscc/
  F:    include/soc/mscc/ocelot*
  F:    net/dsa/tag_ocelot.c
 +F:    net/dsa/tag_ocelot_8021q.c
  F:    tools/testing/selftests/drivers/net/ocelot/*
  
  OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
@@@ -12918,7 -12887,7 +12918,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 <tony@atomide.com>
  L:    linux-omap@vger.kernel.org
  S:    Maintained
@@@ -13138,7 -13107,7 +13138,7 @@@ M:   Jacopo Mondi <jacopo@jmondi.org
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 -F:    Documentation/devicetree/bindings/media/i2c/ov5647.yaml
 +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
  F:    drivers/media/i2c/ov5647.c
  
  OMNIVISION OV5670 SENSOR DRIVER
@@@ -13337,6 -13306,15 +13337,6 @@@ S:  Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  F:    sound/drivers/opl4/
  
 -OPROFILE
 -M:    Robert Richter <rric@kernel.org>
 -L:    oprofile-list@lists.sf.net
 -S:    Maintained
 -F:    arch/*/include/asm/oprofile*.h
 -F:    arch/*/oprofile/
 -F:    drivers/oprofile/
 -F:    include/linux/oprofile.h
 -
  ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
  M:    Mark Fasheh <mark@fasheh.com>
  M:    Joel Becker <jlbec@evilplan.org>
@@@ -13999,6 -13977,15 +13999,6 @@@ L:  linux-input@vger.kernel.or
  S:    Maintained
  F:    drivers/hid/hid-picolcd*
  
 -PICOXCELL SUPPORT
 -M:    Jamie Iles <jamie@jamieiles.com>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Supported
 -T:    git git://github.com/jamieiles/linux-2.6-ji.git
 -F:    arch/arm/boot/dts/picoxcell*
 -F:    arch/arm/mach-picoxcell/
 -F:    drivers/crypto/picoxcell*
 -
  PIDFD API
  M:    Christian Brauner <christian@brauner.io>
  L:    linux-kernel@vger.kernel.org
@@@ -14105,6 -14092,7 +14105,6 @@@ L:   linux-mips@vger.kernel.or
  S:    Odd Fixes
  F:    arch/mips/boot/dts/img/pistachio*
  F:    arch/mips/configs/pistachio*_defconfig
 -F:    arch/mips/include/asm/mach-pistachio/
  F:    arch/mips/pistachio/
  
  PKTCDVD DRIVER
@@@ -14627,12 -14615,6 +14627,12 @@@ L: netdev@vger.kernel.or
  S:    Supported
  F:    drivers/staging/qlge/
  
 +QLOGIC QLGE 10Gb ETHERNET DRIVER
 +M:    Coiby Xu <coiby.xu@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/networking/device_drivers/qlogic/qlge.rst
 +
  QM1D1B0004 MEDIA DRIVER
  M:    Akihiro Tsukada <tskd08@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -14984,18 -14966,6 +14984,18 @@@ F: drivers/media/i2c/max9271.
  F:    drivers/media/i2c/max9271.h
  F:    drivers/media/i2c/rdacm20.c
  
 +RDACM21 Camera Sensor
 +M:    Jacopo Mondi <jacopo+renesas@jmondi.org>
 +M:    Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
 +M:    Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
 +M:    Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/i2c/rdacm2x-gmsl.yaml
 +F:    drivers/media/i2c/max9271.c
 +F:    drivers/media/i2c/max9271.h
 +F:    drivers/media/i2c/rdacm21.c
 +
  RDC R-321X SoC
  M:    Florian Fainelli <florian@openwrt.org>
  S:    Maintained
@@@ -15720,6 -15690,7 +15720,6 @@@ F:   drivers/media/i2c/s5k5baf.
  SAMSUNG S5P Security SubSystem (SSS) DRIVER
  M:    Krzysztof Kozlowski <krzk@kernel.org>
  M:    Vladimir Zapolskiy <vz@mleia.com>
 -M:    Kamil Konieczny <k.konieczny@samsung.com>
  L:    linux-crypto@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Maintained
@@@ -16571,7 -16542,6 +16571,7 @@@ M:   Sakari Ailus <sakari.ailus@linux.int
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/imx258.yaml
  F:    drivers/media/i2c/imx258.c
  
  SONY IMX274 SENSOR DRIVER
@@@ -16597,15 -16567,6 +16597,15 @@@ S: Maintaine
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/i2c/imx319.c
  
 +SONY IMX334 SENSOR DRIVER
 +M:    Paul J. Murphy <paul.j.murphy@intel.com>
 +M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
 +L:    linux-media@vger.kernel.org
 +S:    Maintained
 +T:    git git://linuxtv.org/media_tree.git
 +F:    Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
 +F:    drivers/media/i2c/imx334.c
 +
  SONY IMX355 SENSOR DRIVER
  M:    Tianshu Qiu <tian.shu.qiu@intel.com>
  L:    linux-media@vger.kernel.org
@@@ -16976,6 -16937,12 +16976,6 @@@ F:  include/linux/static_call*.
  F:    kernel/jump_label.c
  F:    kernel/static_call.c
  
 -STEC S1220 SKD DRIVER
 -M:    Damien Le Moal <Damien.LeMoal@wdc.com>
 -L:    linux-block@vger.kernel.org
 -S:    Maintained
 -F:    drivers/block/skd*[ch]
 -
  STI AUDIO (ASoC) DRIVERS
  M:    Arnaud Pouliquen <arnaud.pouliquen@st.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -17245,7 -17212,6 +17245,7 @@@ F:   drivers/mfd/syscon.
  
  SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers
  M:    Sudeep Holla <sudeep.holla@arm.com>
 +R:    Cristian Marussi <cristian.marussi@arm.com>
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/arm,sc[mp]i.txt
@@@ -17253,7 -17219,6 +17253,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
  F:    drivers/firmware/arm_scpi.c
 +F:    drivers/regulator/scmi-regulator.c
  F:    drivers/reset/reset-scmi.c
  F:    include/linux/sc[mp]i_protocol.h
  F:    include/trace/events/scmi.h
@@@ -17537,6 -17502,14 +17537,14 @@@ M: Laxman Dewangan <ldewangan@nvidia.co
  S:    Supported
  F:    drivers/spi/spi-tegra*
  
+ TEGRA QUAD SPI DRIVER
+ M:    Thierry Reding <thierry.reding@gmail.com>
+ M:    Jonathan Hunter <jonathanh@nvidia.com>
+ M:    Sowjanya Komatineni <skomatineni@nvidia.com>
+ L:    linux-tegra@vger.kernel.org
+ S:    Maintained
+ F:    drivers/spi/spi-tegra210-quad.c
+ 
  TEGRA VIDEO DRIVER
  M:    Thierry Reding <thierry.reding@gmail.com>
  M:    Jonathan Hunter <jonathanh@nvidia.com>
@@@ -17629,15 -17602,6 +17637,15 @@@ F: include/dt-bindings/soc/ti,sci_pm_do
  F:    include/linux/soc/ti/ti_sci_inta_msi.h
  F:    include/linux/soc/ti/ti_sci_protocol.h
  
 +TEXAS INSTRUMENTS TPS23861 PoE PSE DRIVER
 +M:    Robert Marko <robert.marko@sartura.hr>
 +M:    Luka Perkov <luka.perkov@sartura.hr>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/hwmon/ti,tps23861.yaml
 +F:    Documentation/hwmon/tps23861.rst
 +F:    drivers/hwmon/tps23861.c
 +
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -17691,7 -17655,7 +17699,7 @@@ F:   drivers/thermal/gov_power_allocator.
  F:    include/trace/events/thermal_power_allocator.h
  
  THINKPAD ACPI EXTRAS DRIVER
 -M:    Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
 +M:    Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  L:    ibm-acpi-devel@lists.sourceforge.net
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
@@@ -17888,7 -17852,7 +17896,7 @@@ M:   Dan Murphy <dmurphy@ti.com
  L:    linux-can@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/tcan4x5x.txt
 -F:    drivers/net/can/m_can/tcan4x5x.c
 +F:    drivers/net/can/m_can/tcan4x5x*
  
  TI TRF7970A NFC DRIVER
  M:    Mark Greer <mgreer@animalcreek.com>
@@@ -18152,7 -18116,7 +18160,7 @@@ F:   Documentation/networking/tuntap.rs
  F:    arch/um/os-Linux/drivers/
  
  TURBOCHANNEL SUBSYSTEM
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-mips@vger.kernel.org
  S:    Maintained
@@@ -19785,7 -19749,7 +19793,7 @@@ F:   Documentation/admin-guide/blockdev/z
  F:    drivers/block/zram/
  
  ZS DECSTATION Z85C30 SERIAL DRIVER
 -M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    "Maciej W. Rozycki" <macro@orcam.me.uk>
  S:    Maintained
  F:    drivers/tty/serial/zs.*
  
diff --combined drivers/spi/Kconfig
index 74ea73a,5aab7c6..09a263c
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -203,7 -203,7 +203,7 @@@ config SPI_CADENC
  
  config SPI_CADENCE_QUADSPI
        tristate "Cadence Quad SPI controller"
-       depends on OF && (ARM || ARM64 || COMPILE_TEST)
+       depends on OF && (ARM || ARM64 || X86 || COMPILE_TEST)
        help
          Enable support for the Cadence Quad SPI Flash controller.
  
@@@ -292,13 -292,6 +292,6 @@@ config SPI_DLN
         This driver can also be built as a module.  If so, the module
         will be called spi-dln2.
  
- config SPI_EFM32
-       tristate "EFM32 SPI controller"
-       depends on OF && ARM && (ARCH_EFM32 || COMPILE_TEST)
-       select SPI_BITBANG
-       help
-         Driver for the spi controller found on Energy Micro's EFM32 SoCs.
- 
  config SPI_EP93XX
        tristate "Cirrus Logic EP93xx SPI controller"
        depends on ARCH_EP93XX || COMPILE_TEST
@@@ -601,6 -594,7 +594,6 @@@ config SPI_PIC32_SQ
  config SPI_PL022
        tristate "ARM AMBA PL022 SSP controller"
        depends on ARM_AMBA
 -      default y if MACH_U300
        default y if ARCH_REALVIEW
        default y if INTEGRATOR_IMPD1
        default y if ARCH_VERSATILE
@@@ -649,7 -643,7 +642,7 @@@ config SPI_RPCI
        tristate "Renesas RPC-IF SPI driver"
        depends on RENESAS_RPCIF
        help
-         SPI driver for Renesas R-Car Gen3 RPC-IF.
+         SPI driver for Renesas R-Car Gen3 or RZ/G2 RPC-IF.
  
  config SPI_RSPI
        tristate "Renesas RSPI/QSPI controller"
@@@ -750,13 -744,6 +743,6 @@@ config SPI_SIFIV
        help
          This exposes the SPI controller IP from SiFive.
  
- config SPI_SIRF
-       tristate "CSR SiRFprimaII SPI controller"
-       depends on SIRF_DMA
-       select SPI_BITBANG
-       help
-         SPI driver for CSR SiRFprimaII SoCs
- 
  config SPI_SLAVE_MT27XX
        tristate "MediaTek SPI slave device"
        depends on ARCH_MEDIATEK || COMPILE_TEST
@@@ -842,6 -829,15 +828,15 @@@ config SPI_MX
        help
          SPI driver for Freescale MXS devices.
  
+ config SPI_TEGRA210_QUAD
+       tristate "NVIDIA Tegra QSPI Controller"
+       depends on ARCH_TEGRA || COMPILE_TEST
+       depends on RESET_CONTROLLER
+       help
+         QSPI driver for NVIDIA Tegra QSPI Controller interface. This
+         controller is different from the SPI controller and is available
+         on Tegra SoCs starting from Tegra210.
+ 
  config SPI_TEGRA114
        tristate "NVIDIA Tegra114 SPI Controller"
        depends on (ARCH_TEGRA && TEGRA20_APB_DMA) || COMPILE_TEST
@@@ -884,12 -880,6 +879,6 @@@ config SPI_TOPCLIFF_PC
          This driver also supports the ML7213/ML7223/ML7831, a companion chip
          for the Atom E6xx series and compatible with the Intel EG20T PCH.
  
- config SPI_TXX9
-       tristate "Toshiba TXx9 SPI controller"
-       depends on GPIOLIB && (CPU_TX49XX || COMPILE_TEST)
-       help
-         SPI driver for Toshiba TXx9 MIPS SoCs
- 
  config SPI_UNIPHIER
        tristate "Socionext UniPhier SPI Controller"
        depends on (ARCH_UNIPHIER || COMPILE_TEST) && OF
diff --combined drivers/spi/spi.c
index 801d8b4,dc4d19b..b08efe8
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@ -810,7 -810,8 +810,8 @@@ static void spi_set_cs(struct spi_devic
        spi->controller->last_cs_enable = enable;
        spi->controller->last_cs_mode_high = spi->mode & SPI_CS_HIGH;
  
-       if (!spi->controller->set_cs_timing) {
+       if (spi->cs_gpiod || gpio_is_valid(spi->cs_gpio) ||
+           !spi->controller->set_cs_timing) {
                if (enable1)
                        spi_delay_exec(&spi->controller->cs_setup, NULL);
                else
@@@ -841,7 -842,8 +842,8 @@@
                spi->controller->set_cs(spi, !enable);
        }
  
-       if (!spi->controller->set_cs_timing) {
+       if (spi->cs_gpiod || gpio_is_valid(spi->cs_gpio) ||
+           !spi->controller->set_cs_timing) {
                if (!enable1)
                        spi_delay_exec(&spi->controller->cs_inactive, NULL);
        }
@@@ -1267,7 -1269,7 +1269,7 @@@ static int spi_transfer_one_message(str
                        ptp_read_system_prets(xfer->ptp_sts);
                }
  
-               if (xfer->tx_buf || xfer->rx_buf) {
+               if ((xfer->tx_buf || xfer->rx_buf) && xfer->len) {
                        reinit_completion(&ctlr->xfer_completion);
  
  fallback_pio:
@@@ -1945,6 -1947,9 +1947,9 @@@ static int of_spi_parse_dt(struct spi_c
        /* Device DUAL/QUAD mode */
        if (!of_property_read_u32(nc, "spi-tx-bus-width", &value)) {
                switch (value) {
+               case 0:
+                       spi->mode |= SPI_NO_TX;
+                       break;
                case 1:
                        break;
                case 2:
@@@ -1966,6 -1971,9 +1971,9 @@@
  
        if (!of_property_read_u32(nc, "spi-rx-bus-width", &value)) {
                switch (value) {
+               case 0:
+                       spi->mode |= SPI_NO_RX;
+                       break;
                case 1:
                        break;
                case 2:
@@@ -2210,7 -2218,7 +2218,7 @@@ static acpi_status acpi_register_spi_de
                return AE_OK;
  
        if (!lookup.max_speed_hz &&
 -          !ACPI_FAILURE(acpi_get_parent(adev->handle, &parent_handle)) &&
 +          ACPI_SUCCESS(acpi_get_parent(adev->handle, &parent_handle)) &&
            ACPI_HANDLE(ctlr->dev.parent) == parent_handle) {
                /* Apple does not use _CRS but nested devices for SPI slaves */
                acpi_spi_parse_apple_properties(adev, &lookup);
@@@ -3333,12 -3341,16 +3341,16 @@@ int spi_setup(struct spi_device *spi
        unsigned        bad_bits, ugly_bits;
        int             status;
  
-       /* check mode to prevent that DUAL and QUAD set at the same time
+       /*
+        * check mode to prevent that any two of DUAL, QUAD and NO_MOSI/MISO
+        * are set at the same time
         */
-       if (((spi->mode & SPI_TX_DUAL) && (spi->mode & SPI_TX_QUAD)) ||
-               ((spi->mode & SPI_RX_DUAL) && (spi->mode & SPI_RX_QUAD))) {
+       if ((hweight_long(spi->mode &
+               (SPI_TX_DUAL | SPI_TX_QUAD | SPI_NO_TX)) > 1) ||
+           (hweight_long(spi->mode &
+               (SPI_RX_DUAL | SPI_RX_QUAD | SPI_NO_RX)) > 1)) {
                dev_err(&spi->dev,
-               "setup: can not select dual and quad at the same time\n");
+               "setup: can not select any two of dual, quad and no-rx/tx at the same time\n");
                return -EINVAL;
        }
        /* if it is SPI_3WIRE mode, DUAL and QUAD should be forbidden
@@@ -3352,7 -3364,8 +3364,8 @@@
         * SPI_CS_WORD has a fallback software implementation,
         * so it is ignored here.
         */
-       bad_bits = spi->mode & ~(spi->controller->mode_bits | SPI_CS_WORD);
+       bad_bits = spi->mode & ~(spi->controller->mode_bits | SPI_CS_WORD |
+                                SPI_NO_TX | SPI_NO_RX);
        /* nothing prevents from working with active-high CS in case if it
         * is driven by GPIO.
         */
@@@ -3449,11 -3462,31 +3462,31 @@@ EXPORT_SYMBOL_GPL(spi_setup)
  int spi_set_cs_timing(struct spi_device *spi, struct spi_delay *setup,
                      struct spi_delay *hold, struct spi_delay *inactive)
  {
+       struct device *parent = spi->controller->dev.parent;
        size_t len;
+       int status;
+ 
+       if (spi->controller->set_cs_timing &&
+           !(spi->cs_gpiod || gpio_is_valid(spi->cs_gpio))) {
+               if (spi->controller->auto_runtime_pm) {
+                       status = pm_runtime_get_sync(parent);
+                       if (status < 0) {
+                               pm_runtime_put_noidle(parent);
+                               dev_err(&spi->controller->dev, "Failed to power device: %d\n",
+                                       status);
+                               return status;
+                       }
  
-       if (spi->controller->set_cs_timing)
-               return spi->controller->set_cs_timing(spi, setup, hold,
-                                                     inactive);
+                       status = spi->controller->set_cs_timing(spi, setup,
+                                                               hold, inactive);
+                       pm_runtime_mark_last_busy(parent);
+                       pm_runtime_put_autosuspend(parent);
+                       return status;
+               } else {
+                       return spi->controller->set_cs_timing(spi, setup, hold,
+                                                             inactive);
+               }
+       }
  
        if ((setup && setup->unit == SPI_DELAY_UNIT_SCK) ||
            (hold && hold->unit == SPI_DELAY_UNIT_SCK) ||
@@@ -3615,6 -3648,8 +3648,8 @@@ static int __spi_validate(struct spi_de
                 * 2. check tx/rx_nbits match the mode in spi_device
                 */
                if (xfer->tx_buf) {
+                       if (spi->mode & SPI_NO_TX)
+                               return -EINVAL;
                        if (xfer->tx_nbits != SPI_NBITS_SINGLE &&
                                xfer->tx_nbits != SPI_NBITS_DUAL &&
                                xfer->tx_nbits != SPI_NBITS_QUAD)
@@@ -3628,6 -3663,8 +3663,8 @@@
                }
                /* check transfer rx_nbits */
                if (xfer->rx_buf) {
+                       if (spi->mode & SPI_NO_RX)
+                               return -EINVAL;
                        if (xfer->rx_nbits != SPI_NBITS_SINGLE &&
                                xfer->rx_nbits != SPI_NBITS_DUAL &&
                                xfer->rx_nbits != SPI_NBITS_QUAD)
MicroBlaze GIT Repository