Merge tag 'spi-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi updates from Mark Brown:
 "A fairly quiet release for SPI, the biggest thing is the conversion to
  use GPIO descriptors which is now 90% done but still needs some
  stragglers converting.

  Summary:

   - Support for inter-word delays

   - Conversion of the core and most drivers to use GPIO descriptors for
     GPIO controlled chip selects

   - New drivers for NXP FlexSPI and QuadSPI, SiFive and Spreadtrum"

* tag 'spi-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (104 commits)
  spi: sh-msiof: Restrict bits per word to 8/16/24/32 on R-Car Gen2/3
  spi: sifive: Remove redundant dev_err call in sifive_spi_probe()
  spi: sifive: Remove spi_master_put in sifive_spi_remove()
  spi: spi-gpio: fix SPI_CS_HIGH capability
  spi: pxa2xx: Setup maximum supported DMA transfer length
  spi: sifive: Add driver for the SiFive SPI controller
  spi: sifive: Add DT documentation for SiFive SPI controller
  spi: sprd: Add a prefix for SPI DMA channel macros
  spi: sprd: spi: sprd: Add DMA mode support
  dt-bindings: spi: Add the DMA properties for the SPI dma mode
  spi: sprd: Add the SPI irq function for the SPI DMA mode
  dt-bindings: spi: imx: Add an entry for the i.MX8QM compatible
  spi: use gpio[d]_set_value_cansleep for setting chipselect GPIO
  spi: gpio: Advertise support for SPI_CS_HIGH
  spi: sh-msiof: Replace spi_master by spi_controller
  spi: sh-hspi: Replace spi_master by spi_controller
  spi: rspi: Replace spi_master by spi_controller
  spi: atmel-quadspi: add support for sam9x60 qspi controller
  dt-bindings: spi: atmel-quadspi: QuadSPI driver for Microchip SAM9X60
  spi: atmel-quadspi: add support for named peripheral clock
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-pxa/em-x270.c
Simple merge

diff --cc arch/arm/mach-pxa/hx4700.c
Simple merge

diff --cc arch/arm/mach-pxa/magician.c
Simple merge

diff --cc arch/arm/mach-pxa/zeus.c
Simple merge

diff --cc drivers/mtd/spi-nor/Kconfig
Simple merge

diff --cc drivers/mtd/spi-nor/Makefile
index 4e4d4005d7a62d33cb80f5e64a8e909958bb1f24,2adedbe07662e67cef8ae76120b9772429b2d6f3..189a15cca3ec34f10dd13043e0ed270069d4fb23
--- 1/drivers/mtd/spi-nor/Makefile
--- 2/drivers/mtd/spi-nor/Makefile
+++ b/drivers/mtd/spi-nor/Makefile
@@@ -2,9 -2,8 +2,8 @@@
  obj-$(CONFIG_MTD_SPI_NOR)     += spi-nor.o
  obj-$(CONFIG_SPI_ASPEED_SMC)  += aspeed-smc.o
  obj-$(CONFIG_SPI_CADENCE_QUADSPI)     += cadence-quadspi.o
- obj-$(CONFIG_SPI_FSL_QUADSPI) += fsl-quadspi.o
  obj-$(CONFIG_SPI_HISI_SFC)    += hisi-sfc.o
 -obj-$(CONFIG_MTD_MT81xx_NOR)    += mtk-quadspi.o
 +obj-$(CONFIG_SPI_MTK_QUADSPI)    += mtk-quadspi.o
  obj-$(CONFIG_SPI_NXP_SPIFI)   += nxp-spifi.o
  obj-$(CONFIG_SPI_INTEL_SPI)   += intel-spi.o
  obj-$(CONFIG_SPI_INTEL_SPI_PCI)       += intel-spi-pci.o