From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Mar 2019 03:23:56 +0000 (-0800)
Subject: Merge tag 'spi-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
X-Git-Tag: v5.1-rc1~181
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dcc75ddea1c3dde05db2f485d617dc8431177e33;p=users%2Fdwmw2%2Flinux.git

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
  ...
---

dcc75ddea1c3dde05db2f485d617dc8431177e33
diff --cc drivers/mtd/spi-nor/Makefile
index 4e4d4005d7a62,2adedbe07662e..189a15cca3ec3
--- a/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